40 lines
1.4 KiB
Diff
40 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 bd643d9db83860ca35ef53f9a3e584985c725c14
|
|
# parent: 47cc7392741ad120a0c5745f7aeaf00a1aefd538
|
|
[LINUX] PV-on-HVM: Remove the attr parameter from device attribute
|
|
show methods on kernels prior to 2.6.13. The parameter was not present
|
|
before that.
|
|
|
|
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
|
|
@@ -453,14 +453,20 @@ char *kasprintf(const char *fmt, ...)
|
|
}
|
|
|
|
static ssize_t xendev_show_nodename(struct device *dev,
|
|
- struct device_attribute *attr, char *buf)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
|
|
+ struct device_attribute *attr,
|
|
+#endif
|
|
+ char *buf)
|
|
{
|
|
return sprintf(buf, "%s\n", to_xenbus_device(dev)->nodename);
|
|
}
|
|
DEVICE_ATTR(nodename, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_nodename, NULL);
|
|
|
|
static ssize_t xendev_show_devtype(struct device *dev,
|
|
- struct device_attribute *attr, char *buf)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
|
|
+ struct device_attribute *attr,
|
|
+#endif
|
|
+ char *buf)
|
|
{
|
|
return sprintf(buf, "%s\n", to_xenbus_device(dev)->devicetype);
|
|
}
|
|
|