Messages in this thread Patch in this message | | | Date | Wed, 15 Mar 2006 08:28:55 -0500 | From | "Jun'ichi Nomura" <> | Subject | Re: [PATCH] kobject_uevent CONFIG_SYSFS=n build fix |
| |
Greg KH wrote: >>>>+#ifdef CONFIG_HOTPLUG >>>>#define UEVENT_HELPER_PATH_LEN 256 >> >>>That shouldn't be needed, right? >> >>You're right. They are not needed. >>Please disregard that part. > > > Looks good. Care to resend it one more time, this time with a good > changelog description and a Signed-off-by: line?
OK, here you are. The patch is applicable to either 2.6.16-rc6 or 2.6.16-rc6-mm1.
Thanks, -- Jun'ichi Nomura, NEC Solutions (America), Inc. Moving uevent_seqnum and uevent_helper to kobject_uevent.c because they are used even if CONFIG_SYSFS=n while kernel/ksysfs.c is built only if CONFIG_SYSFS=y,
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
--- linux-2.6.16-rc6-mm1.orig/lib/kobject_uevent.c 2006-03-14 22:57:23.000000000 +0900 +++ linux-2.6.16-rc6-mm1/lib/kobject_uevent.c 2006-03-15 08:39:33.000000000 +0900 @@ -25,6 +25,11 @@ #define BUFFER_SIZE 2048 /* buffer for the variables */ #define NUM_ENVP 32 /* number of env pointers */ +#ifdef CONFIG_HOTPLUG +u64 uevent_seqnum; +char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug"; +#endif + #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) static DEFINE_SPINLOCK(sequence_lock); static struct sock *uevent_sock; --- linux-2.6.16-rc6-mm1.orig/kernel/ksysfs.c 2006-03-14 22:57:31.000000000 +0900 +++ linux-2.6.16-rc6-mm1/kernel/ksysfs.c 2006-03-15 08:41:11.000000000 +0900 @@ -15,9 +15,6 @@ #include <linux/module.h> #include <linux/init.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)
| |