# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 487fe5006064d516274efaf494f16dae9e9833b4
# Parent 45f3c127069dbaac314d12178d061fd072f30632
[LINUX] Allow xenbus to be built as a module.
Signed-off-by: Steven Smith <ssmith@xxxxxxxxxxxxx>
---
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c | 4 +---
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c | 6 ++++++
linux-2.6-xen-sparse/include/xen/xenbus.h | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff -r 45f3c127069d -r 487fe5006064
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Thu Aug 17
16:22:08 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Thu Aug 17
16:28:47 2006 +0100
@@ -346,7 +346,7 @@ static struct file_operations xenbus_dev
.poll = xenbus_dev_poll,
};
-static int __init
+int __init
xenbus_dev_init(void)
{
xenbus_dev_intf = create_xen_proc_entry("xenbus", 0400);
@@ -355,5 +355,3 @@ xenbus_dev_init(void)
return 0;
}
-
-__initcall(xenbus_dev_init);
diff -r 45f3c127069d -r 487fe5006064
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Thu Aug 17
16:22:08 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Thu Aug 17
16:28:47 2006 +0100
@@ -1023,6 +1023,8 @@ static int __init xenbus_probe_init(void
xen_store_interface = mfn_to_virt(xen_store_mfn);
+ xenbus_dev_init();
+
/* Initialize the interface to xenstore. */
err = xs_init();
if (err) {
@@ -1054,6 +1056,8 @@ static int __init xenbus_probe_init(void
}
postcore_initcall(xenbus_probe_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
static int is_disconnected_device(struct device *dev, void *data)
@@ -1138,6 +1142,7 @@ static void wait_for_devices(struct xenb
print_device_status);
}
+#ifndef MODULE
static int __init boot_wait_for_devices(void)
{
ready_to_wait_for_devices = 1;
@@ -1146,3 +1151,4 @@ static int __init boot_wait_for_devices(
}
late_initcall(boot_wait_for_devices);
+#endif
diff -r 45f3c127069d -r 487fe5006064 linux-2.6-xen-sparse/include/xen/xenbus.h
--- a/linux-2.6-xen-sparse/include/xen/xenbus.h Thu Aug 17 16:22:08 2006 +0100
+++ b/linux-2.6-xen-sparse/include/xen/xenbus.h Thu Aug 17 16:28:47 2006 +0100
@@ -295,5 +295,6 @@ void xenbus_dev_fatal(struct xenbus_devi
void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
...);
+int __init xenbus_dev_init(void);
#endif /* _XEN_XENBUS_H */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home