From 171ad3c861987e2b9af6d5e635c016f542f23699 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Fri, 20 Jul 2007 13:58:13 +0200 Subject: [PATCH] --- yaml --- r: 63213 b: refs/heads/master c: cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a h: refs/heads/master i: 63211: e96fe94b0339e05fa38c1f5a16af062fdf2649c1 v: v3 --- [refs] | 2 +- trunk/lib/kobject_uevent.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 707f70bfb1f8..ad81ee8b3357 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b43626f0cdfb3154c57d52e732679c9d3484369 +refs/heads/master: cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a diff --git a/trunk/lib/kobject_uevent.c b/trunk/lib/kobject_uevent.c index 6a80c784a8fb..df02814699d7 100644 --- a/trunk/lib/kobject_uevent.c +++ b/trunk/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 *