From 117dafbf3ddfb51b016018a35b7c48f13b53e0d8 Mon Sep 17 00:00:00 2001
From: "akpm@osdl.org" <akpm@osdl.org>
Date: Tue, 22 Nov 2005 23:36:13 -0800
Subject: [PATCH] --- yaml --- r: 16208 b: refs/heads/master c:
 f743ca5e10f4145e0b3e6d11b9b46171e16af7ce h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/kobject.h | 2 +-
 trunk/kernel/ksysfs.c         | 3 +++
 trunk/lib/kobject_uevent.c    | 4 +---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7b2c62e1afe0..7a5f36053925 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d960bb4db9f422b5c3c82e0dfd6c8213a4fc430d
+refs/heads/master: f743ca5e10f4145e0b3e6d11b9b46171e16af7ce
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index 8eb21f2f25e1..2a8d8da70961 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -253,7 +253,7 @@ struct subsys_attribute {
 extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
 extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
 
-#ifdef CONFIG_HOTPLUG
+#if defined(CONFIG_HOTPLUG) & defined(CONFIG_NET)
 void kobject_uevent(struct kobject *kobj, enum kobject_action action);
 
 int add_uevent_var(char **envp, int num_envp, int *cur_index,
diff --git a/trunk/kernel/ksysfs.c b/trunk/kernel/ksysfs.c
index bfb4a7a54e22..99af8b05eeaa 100644
--- a/trunk/kernel/ksysfs.c
+++ b/trunk/kernel/ksysfs.c
@@ -15,6 +15,9 @@
 #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)
 
diff --git a/trunk/lib/kobject_uevent.c b/trunk/lib/kobject_uevent.c
index 01479e5c6d18..f56e27ae9d52 100644
--- a/trunk/lib/kobject_uevent.c
+++ b/trunk/lib/kobject_uevent.c
@@ -25,9 +25,7 @@
 #define BUFFER_SIZE	1024	/* buffer for the variables */
 #define NUM_ENVP	32	/* number of env pointers */
 
-#if defined(CONFIG_HOTPLUG)
-char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
-u64 uevent_seqnum;
+#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
 static DEFINE_SPINLOCK(sequence_lock);
 static struct sock *uevent_sock;