diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2007-07-20 13:58:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-30 14:25:11 -0700 |
| commit | cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a (patch) | |
| tree | a4ac7389ed9adbc0aaeb80c019b135fa14b545f1 /lib/kobject_uevent.c | |
| parent | 8b43626f0cdfb3154c57d52e732679c9d3484369 (diff) | |
| download | linux-stable-cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a.tar.gz linux-stable-cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a.tar.bz2 linux-stable-cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a.zip | |
kobject: fix link error when CONFIG_HOTPLUG is disabled
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>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib/kobject_uevent.c')
| -rw-r--r-- | lib/kobject_uevent.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 6a80c784a8fb..df02814699d7 100644 --- a/lib/kobject_uevent.c +++ b/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 * |