X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fksysfs.c;h=f119e098e67b1758c3ceffdb095cfdcc40232b2c;hb=97e94c453073a2aba4bb5e0825ddc5e923debf11;hp=015fb69ad94da0724fcd7806aecf29405fbc7949;hpb=54522b6613a03807f057fd567794a31267ef85cb;p=linux-2.6

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index 015fb69ad9..f119e098e6 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -22,33 +22,39 @@ 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
-static ssize_t hotplug_seqnum_show(struct subsystem *subsys, char *page)
+#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+/* current uevent sequence number */
+static ssize_t uevent_seqnum_show(struct subsystem *subsys, 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(hotplug_seqnum);
-#endif
-
-#ifdef CONFIG_KEXEC
-#include <asm/kexec.h>
+KERNEL_ATTR_RO(uevent_seqnum);
 
-static ssize_t crash_notes_show(struct subsystem *subsys, char *page)
+/* uevent helper program, used during early boo */
+static ssize_t uevent_helper_show(struct subsystem *subsys, char *page)
 {
-	return sprintf(page, "%p\n", (void *)crash_notes);
+	return sprintf(page, "%s\n", uevent_helper);
 }
-KERNEL_ATTR_RO(crash_notes);
+static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count)
+{
+	if (count+1 > UEVENT_HELPER_PATH_LEN)
+		return -ENOENT;
+	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
 
 decl_subsys(kernel, NULL, NULL);
 EXPORT_SYMBOL_GPL(kernel_subsys);
 
 static struct attribute * kernel_attrs[] = {
-#ifdef CONFIG_HOTPLUG
-	&hotplug_seqnum_attr.attr,
-#endif
-#ifdef CONFIG_KEXEC
-	&crash_notes_attr.attr,
+#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+	&uevent_seqnum_attr.attr,
+	&uevent_helper_attr.attr,
 #endif
 	NULL
 };