Fix crash with irqpoll due to the IRQF_IRQPOLL flag testing

[safe/jmp/linux-2.6] / kernel / ksysfs.c

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index e975a76..559deca 100644 (file)
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -8,12 +8,12 @@
  *
  */
 
-#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>
 
 #define KERNEL_ATTR_RO(_name) \
 static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
@@ -22,52 +22,57 @@ static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
 static struct subsys_attribute _name##_attr = \
        __ATTR(_name, 0644, _name##_show, _name##_store)
 
-#ifdef CONFIG_HOTPLUG
+#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
 /* current uevent sequence number */
-static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page)
+static ssize_t uevent_seqnum_show(struct kset *kset, char *page)
 {
-       return sprintf(page, "%llu\n", (unsigned long long)hotplug_seqnum);
+       return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum);
 }
 KERNEL_ATTR_RO(uevent_seqnum);
 
 /* uevent helper program, used during early boo */
-static ssize_t uevent_helper_show(struct subsystem *subsys, char *page)
+static ssize_t uevent_helper_show(struct kset *kset, char *page)
 {
-       return sprintf(page, "%s\n", hotplug_path);
+       return sprintf(page, "%s\n", uevent_helper);
 }
-static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count)
+static ssize_t uevent_helper_store(struct kset *kset, const char *page, size_t count)
 {
-       if (count+1 > HOTPLUG_PATH_LEN)
+       if (count+1 > UEVENT_HELPER_PATH_LEN)
                return -ENOENT;
-       memcpy(hotplug_path, page, count);
-       hotplug_path[count] = '\0';
-       if (count && hotplug_path[count-1] == '\n')
-               hotplug_path[count-1] = '\0';
+       memcpy(uevent_helper, page, count);
+       uevent_helper[count] = '\0';
+       if (count && uevent_helper[count-1] == '\n')
+               uevent_helper[count-1] = '\0';
        return count;
 }
 KERNEL_ATTR_RW(uevent_helper);
 #endif
 
 #ifdef CONFIG_KEXEC
-#include <asm/kexec.h>
+static ssize_t kexec_loaded_show(struct kset *kset, char *page)
+{
+       return sprintf(page, "%d\n", !!kexec_image);
+}
+KERNEL_ATTR_RO(kexec_loaded);
 
-static ssize_t crash_notes_show(struct subsystem *subsys, char *page)
+static ssize_t kexec_crash_loaded_show(struct kset *kset, char *page)
 {
-       return sprintf(page, "%p\n", (void *)crash_notes);
+       return sprintf(page, "%d\n", !!kexec_crash_image);
 }
-KERNEL_ATTR_RO(crash_notes);
-#endif
+KERNEL_ATTR_RO(kexec_crash_loaded);
+#endif /* CONFIG_KEXEC */
 
 decl_subsys(kernel, NULL, NULL);
 EXPORT_SYMBOL_GPL(kernel_subsys);
 
 static struct attribute * kernel_attrs[] = {
-#ifdef CONFIG_HOTPLUG
+#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
        &uevent_seqnum_attr.attr,
        &uevent_helper_attr.attr,
 #endif
 #ifdef CONFIG_KEXEC
-       &crash_notes_attr.attr,
+       &kexec_loaded_attr.attr,
+       &kexec_crash_loaded_attr.attr,
 #endif
        NULL
 };
@@ -80,7 +85,7 @@ static int __init ksysfs_init(void)
 {
        int error = subsystem_register(&kernel_subsys);
        if (!error)
-               error = sysfs_create_group(&kernel_subsys.kset.kobj,
+               error = sysfs_create_group(&kernel_subsys.kobj,
                                           &kernel_attr_group);
 
        return error;