Xen devel - Jun 2007 - [PATCH] linux-2.6.18: utilize SYS_HYPERVISOR config option

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: head-2007-05-31/drivers/xen/Kconfig
==================================================================---
head-2007-05-31.orig/drivers/xen/Kconfig	2007-06-06 17:04:59.000000000 +0200
+++ head-2007-05-31/drivers/xen/Kconfig	2007-06-04 13:48:38.000000000 +0200
@@ -216,6 +216,7 @@ config XEN_DISABLE_SERIAL
 config XEN_SYSFS
 	tristate "Export Xen attributes in sysfs"
 	depends on SYSFS
+	select SYS_HYPERVISOR
 	default y
 	help
 	  Xen hypervisor attributes will show up under /sys/hypervisor/.
Index: head-2007-05-31/drivers/xen/core/Makefile
==================================================================---
head-2007-05-31.orig/drivers/xen/core/Makefile	2007-06-06 17:04:59.000000000
+0200
+++ head-2007-05-31/drivers/xen/core/Makefile	2007-06-04 13:55:09.000000000
+0200
@@ -5,7 +5,7 @@
 obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o
 
 obj-$(CONFIG_PROC_FS)		+= xen_proc.o
-obj-$(CONFIG_SYSFS)		+= hypervisor_sysfs.o
+obj-$(CONFIG_SYS_HYPERVISOR)	+= hypervisor_sysfs.o
 obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o
 obj-$(CONFIG_XEN_SYSFS)		+= xen_sysfs.o
 obj-$(CONFIG_XEN_SMPBOOT)	+= smpboot.o
Index: head-2007-05-31/drivers/xen/core/hypervisor_sysfs.c
==================================================================---
head-2007-05-31.orig/drivers/xen/core/hypervisor_sysfs.c	2007-06-06
17:04:59.000000000 +0200
+++ head-2007-05-31/drivers/xen/core/hypervisor_sysfs.c	2007-06-04
13:57:46.000000000 +0200
@@ -12,8 +12,6 @@
 #include <linux/kobject.h>
 #include <xen/hypervisor_sysfs.h>
 
-decl_subsys(hypervisor, NULL, NULL);
-
 static ssize_t hyp_sysfs_show(struct kobject *kobj,
 			      struct attribute *attr,
 			      char *buffer)
@@ -37,7 +35,7 @@ static ssize_t hyp_sysfs_store(struct ko
 	return 0;
 }
 
-struct sysfs_ops hyp_sysfs_ops = {
+static struct sysfs_ops hyp_sysfs_ops = {
 	.show = hyp_sysfs_show,
 	.store = hyp_sysfs_store,
 };
@@ -52,8 +50,7 @@ static int __init hypervisor_subsys_init
 		return -ENODEV;
 
 	hypervisor_subsys.kset.kobj.ktype = &hyp_sysfs_kobj_type;
-	return subsystem_register(&hypervisor_subsys);
+	return 0;
 }
 
 device_initcall(hypervisor_subsys_init);
-EXPORT_SYMBOL_GPL(hypervisor_subsys);
Index: head-2007-05-31/include/xen/hypervisor_sysfs.h
==================================================================---
head-2007-05-31.orig/include/xen/hypervisor_sysfs.h	2007-06-06
17:04:59.000000000 +0200
+++ head-2007-05-31/include/xen/hypervisor_sysfs.h	2007-06-04 13:43:51.000000000
+0200
@@ -20,8 +20,6 @@ static struct hyp_sysfs_attr  _name##_at
 static struct hyp_sysfs_attr _name##_attr = \
 	__ATTR(_name, 0644, _name##_show, _name##_store)
 
-extern struct subsystem hypervisor_subsys;
-
 struct hyp_sysfs_attr {
 	struct attribute attr;
 	ssize_t (*show)(struct hyp_sysfs_attr *, char *);




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