[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [linux-2.6.18-xen] xen sysfs: Fix build when kexec support is not configured.



# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1213695122 -3600
# Node ID b5ca56b48581e3e8ffc659d78f4aa725082c974c
# Parent  4b600eae1fb799b295c7f20641bdeb4dd5ee0578
xen sysfs: Fix build when kexec support is not configured.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 drivers/xen/core/xen_sysfs.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

diff -r 4b600eae1fb7 -r b5ca56b48581 drivers/xen/core/xen_sysfs.c
--- a/drivers/xen/core/xen_sysfs.c      Tue Jun 17 09:37:36 2008 +0100
+++ b/drivers/xen/core/xen_sysfs.c      Tue Jun 17 10:32:02 2008 +0100
@@ -335,6 +335,8 @@ static void xen_properties_destroy(void)
                           &xen_properties_group);
 }
 
+#ifdef CONFIG_KEXEC
+
 static ssize_t vmcoreinfo_show(struct hyp_sysfs_attr *attr, char *page)
 {
        return sprintf(page, "%lx %zx\n",
@@ -345,13 +347,21 @@ HYPERVISOR_ATTR_RO(vmcoreinfo);
 
 static int __init xen_sysfs_vmcoreinfo_init(void)
 {
-       return sysfs_create_file(&hypervisor_subsys.kset.kobj, 
&vmcoreinfo_attr.attr);
+       return sysfs_create_file(&hypervisor_subsys.kset.kobj,
+                                &vmcoreinfo_attr.attr);
 }
 
 static void xen_sysfs_vmcoreinfo_destroy(void)
 {
        sysfs_remove_file(&hypervisor_subsys.kset.kobj, &vmcoreinfo_attr.attr);
 }
+
+#else
+
+#define xen_sysfs_vmcoreinfo_init()    0
+#define xen_sysfs_vmcoreinfo_destroy() ((void)0)
+
+#endif
 
 static int __init hyper_sysfs_init(void)
 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.