# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1182346774 -3600
# Node ID 496e3157a35c32d7a550223914cfb92389a80874
# Parent 87bb8705768a66ceabb15a419c5f86580bffb6bf
xen sysfs: Utilize SYS_HYPERVISOR config option
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
drivers/xen/Kconfig | 1 +
drivers/xen/core/Makefile | 2 +-
drivers/xen/core/hypervisor_sysfs.c | 7 ++-----
include/xen/hypervisor_sysfs.h | 2 --
4 files changed, 4 insertions(+), 8 deletions(-)
diff -r 87bb8705768a -r 496e3157a35c drivers/xen/Kconfig
--- a/drivers/xen/Kconfig Tue Jun 19 15:36:16 2007 +0100
+++ b/drivers/xen/Kconfig Wed Jun 20 14:39:34 2007 +0100
@@ -232,6 +232,7 @@ config XEN_SYSFS
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/.
diff -r 87bb8705768a -r 496e3157a35c drivers/xen/core/Makefile
--- a/drivers/xen/core/Makefile Tue Jun 19 15:36:16 2007 +0100
+++ b/drivers/xen/core/Makefile Wed Jun 20 14:39:34 2007 +0100
@@ -5,7 +5,7 @@ obj-y := evtchn.o gnttab.o features.o re
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
diff -r 87bb8705768a -r 496e3157a35c drivers/xen/core/hypervisor_sysfs.c
--- a/drivers/xen/core/hypervisor_sysfs.c Tue Jun 19 15:36:16 2007 +0100
+++ b/drivers/xen/core/hypervisor_sysfs.c Wed Jun 20 14:39:34 2007 +0100
@@ -11,8 +11,6 @@
#include <linux/module.h>
#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,
@@ -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);
diff -r 87bb8705768a -r 496e3157a35c include/xen/hypervisor_sysfs.h
--- a/include/xen/hypervisor_sysfs.h Tue Jun 19 15:36:16 2007 +0100
+++ b/include/xen/hypervisor_sysfs.h Wed Jun 20 14:39:34 2007 +0100
@@ -20,8 +20,6 @@ static struct hyp_sysfs_attr _name##_att
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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home