summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2005-11-11 05:33:52 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 16:18:07 -0800
commit0296b2281352e4794e174b393c37f131502e09f0 (patch)
tree874e1de7ffaf56ab14f031d2818b69853c4914d8 /lib
parent034382117725f6b6b26fbb138498139c5c012c1b (diff)
downloadlinux-stable-0296b2281352e4794e174b393c37f131502e09f0.tar.gz
linux-stable-0296b2281352e4794e174b393c37f131502e09f0.tar.bz2
linux-stable-0296b2281352e4794e174b393c37f131502e09f0.zip
[PATCH] remove CONFIG_KOBJECT_UEVENT option
It makes zero sense to have hotplug, but not the netlink events enabled today. Remove this option and merge the kobject_uevent.h header into the kobject.h header file. Signed-off-by: Kay Sievers <kay.sievers@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/kobject_uevent.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 3ab375411e38..1f90eea7eebc 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -19,14 +19,17 @@
#include <linux/skbuff.h>
#include <linux/netlink.h>
#include <linux/string.h>
-#include <linux/kobject_uevent.h>
#include <linux/kobject.h>
#include <net/sock.h>
#define BUFFER_SIZE 1024 /* buffer for the hotplug env */
#define NUM_ENVP 32 /* number of env pointers */
-#if defined(CONFIG_KOBJECT_UEVENT) || defined(CONFIG_HOTPLUG)
+#if defined(CONFIG_HOTPLUG)
+char hotplug_path[HOTPLUG_PATH_LEN] = "/sbin/hotplug";
+u64 hotplug_seqnum;
+static DEFINE_SPINLOCK(sequence_lock);
+
static char *action_to_string(enum kobject_action action)
{
switch (action) {
@@ -48,9 +51,7 @@ static char *action_to_string(enum kobject_action action)
return NULL;
}
}
-#endif
-#ifdef CONFIG_KOBJECT_UEVENT
static struct sock *uevent_sock;
/**
@@ -168,21 +169,6 @@ static int __init kobject_uevent_init(void)
postcore_initcall(kobject_uevent_init);
-#else
-static inline int send_uevent(const char *signal, const char *obj,
- char **envp, int gfp_mask)
-{
- return 0;
-}
-
-#endif /* CONFIG_KOBJECT_UEVENT */
-
-
-#ifdef CONFIG_HOTPLUG
-char hotplug_path[HOTPLUG_PATH_LEN] = "/sbin/hotplug";
-u64 hotplug_seqnum;
-static DEFINE_SPINLOCK(sequence_lock);
-
/**
* kobject_hotplug - notify userspace by executing /sbin/hotplug
*