41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
# HG changeset patch
|
|
# User Ian Campbell <ian.campbell@xensource.com>
|
|
# Date Wed Oct 25 13:58:30 2006 +0100
|
|
# Node ID a0919d3f7d50dad3db4268611213a3923a497afd
|
|
# parent: 8102ccad440d3218a179e45c296e328aba564983
|
|
[LINUX] PV-on-HVM: The probe, remove and shutdown methods were added
|
|
to struct bus_type in 2.6.16. For older kernels use the methods on the
|
|
struct device_driver.
|
|
|
|
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
|
|
Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com>
|
|
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
|
|
|
|
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Wed Oct 25 13:58:30 2006 +0100
|
|
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Wed Oct 25 13:58:30 2006 +0100
|
|
@@ -171,9 +171,11 @@ static struct xen_bus_type xenbus_fronte
|
|
.bus = {
|
|
.name = "xen",
|
|
.match = xenbus_match,
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
|
|
.probe = xenbus_dev_probe,
|
|
.remove = xenbus_dev_remove,
|
|
.shutdown = xenbus_dev_shutdown,
|
|
+#endif
|
|
},
|
|
.dev = {
|
|
.bus_id = "xen",
|
|
@@ -333,6 +335,11 @@ int xenbus_register_driver_common(struct
|
|
drv->driver.bus = &bus->bus;
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
|
|
drv->driver.owner = drv->owner;
|
|
+#endif
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
|
|
+ drv->driver.probe = xenbus_dev_probe;
|
|
+ drv->driver.remove = xenbus_dev_remove;
|
|
+ drv->driver.shutdown = xenbus_dev_shutdown;
|
|
#endif
|
|
|
|
mutex_lock(&xenwatch_mutex);
|
|
|