Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd030c4c authored by Cornelia Huck's avatar Cornelia Huck Committed by Greg Kroah-Hartman
Browse files

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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8b43626f

lib/kobject_uevent.c

+8 −8
Original line number Diff line number Diff line
@@ -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

 *