X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fksysfs.c;fp=kernel%2Fksysfs.c;h=d5eeae0fa5bc5c6de327a7c0f583c4fdaca16b50;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=e0ffe4ab091785d36bccdec062a1fc2cb26c4936;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index e0ffe4ab0..d5eeae0fa 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -8,12 +8,15 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/kobject.h>
 #include <linux/string.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/kexec.h>
+
+u64 uevent_seqnum;
+char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
 
 #define KERNEL_ATTR_RO(_name) \
 static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
@@ -22,7 +25,7 @@ static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
 static struct subsys_attribute _name##_attr = \
 	__ATTR(_name, 0644, _name##_show, _name##_store)
 
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#ifdef CONFIG_HOTPLUG
 /* current uevent sequence number */
 static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page)
 {
@@ -48,31 +51,13 @@ static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, s
 KERNEL_ATTR_RW(uevent_helper);
 #endif
 
-#ifdef CONFIG_KEXEC
-static ssize_t kexec_loaded_show(struct subsystem *subsys, char *page)
-{
-	return sprintf(page, "%d\n", !!kexec_image);
-}
-KERNEL_ATTR_RO(kexec_loaded);
-
-static ssize_t kexec_crash_loaded_show(struct subsystem *subsys, char *page)
-{
-	return sprintf(page, "%d\n", !!kexec_crash_image);
-}
-KERNEL_ATTR_RO(kexec_crash_loaded);
-#endif /* CONFIG_KEXEC */
-
 decl_subsys(kernel, NULL, NULL);
 EXPORT_SYMBOL_GPL(kernel_subsys);
 
 static struct attribute * kernel_attrs[] = {
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#ifdef CONFIG_HOTPLUG
 	&uevent_seqnum_attr.attr,
 	&uevent_helper_attr.attr,
-#endif
-#ifdef CONFIG_KEXEC
-	&kexec_loaded_attr.attr,
-	&kexec_crash_loaded_attr.attr,
 #endif
 	NULL
 };