[PATCH] kobject_uevent CONFIG_NET=n fix (f743ca5e) · Commits · 戴 / test

lib/lib.a(kobject_uevent.o)(.text+0x25f): In function `kobject_uevent': : undefined reference to `__alloc_skb' lib/lib.a(kobject_uevent.o)(.text+0x2a1): In function `kobject_uevent': : undefined reference to `skb_over_panic' lib/lib.a(kobject_uevent.o)(.text+0x31d): In function `kobject_uevent': : undefined reference to `skb_over_panic' lib/lib.a(kobject_uevent.o)(.text+0x356): In function `kobject_uevent': : undefined reference to `netlink_broadcast' lib/lib.a(kobject_uevent.o)(.init.text+0x9): In function `kobject_uevent_init': : undefined reference to `netlink_kernel_create' make: *** [.tmp_vmlinux1] Error 1 Netlink is unconditionally enabled if CONFIG_NET, so that's OK. kobject_uevent.o is compiled even if !CONFIG_HOTPLUG, which is lazy. Let's compound the sin. Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

include/linux/kobject.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

kernel/ksysfs.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)

lib/kobject_uevent.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message