Messages in this thread Patch in this message | | | Date | Fri, 20 Jul 2007 13:58:13 +0200 | From | Cornelia Huck <> | Subject | Re: kobject link failure |
| |
On Fri, 20 Jul 2007 11:32:21 +0200, Cornelia Huck <cornelia.huck@de.ibm.com> wrote:
> Hm, this would be an interface change (the uevent attribute used to > exist even for !CONFIG_HOTPLUG, it just triggered nothing). How about > moving kobject_actions[] out of the #ifdef (maybe next to > kobject_action)?
Leaving kobject_actions[] in kobject_uevent.c, but putting it outside the #ifdef looks indeed like the best solution to me. This way, we avoid adding #ifdef CONFIG_HOTPLUG into core.c, when all other functions called do not need such a thing.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
--- lib/kobject_uevent.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
--- linux-2.6.orig/lib/kobject_uevent.c +++ linux-2.6/lib/kobject_uevent.c @@ -25,14 +25,6 @@ #define BUFFER_SIZE 2048 /* buffer for the variables */ #define NUM_ENVP 32 /* number of env pointers */ -#if defined(CONFIG_HOTPLUG) -u64 uevent_seqnum; -char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug"; -static DEFINE_SPINLOCK(sequence_lock); -#if defined(CONFIG_NET) -static struct sock *uevent_sock; -#endif - /* the strings here must match the enum in include/linux/kobject.h */ const char *kobject_actions[] = { "add", @@ -43,6 +35,14 @@ const char *kobject_actions[] = { "offline", }; +#if defined(CONFIG_HOTPLUG) +u64 uevent_seqnum; +char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug"; +static DEFINE_SPINLOCK(sequence_lock); +#if defined(CONFIG_NET) +static struct sock *uevent_sock; +#endif + /** * kobject_uevent_env - send an uevent with environmental data * - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |