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

Commit 51107301 authored by Jun'ichi Nomura's avatar Jun'ichi Nomura Committed by Greg Kroah-Hartman
Browse files

[PATCH] kobject: fix build error if CONFIG_SYSFS=n 



Moving uevent_seqnum and uevent_helper to kobject_uevent.c
because they are used even if CONFIG_SYSFS=n
while kernel/ksysfs.c is built only if CONFIG_SYSFS=y,

Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 641e6f30

kernel/ksysfs.c

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define NUM_ENVP	32	/* number of env pointers */



#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)

u64 uevent_seqnum;

char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";

static DEFINE_SPINLOCK(sequence_lock);

static struct sock *uevent_sock;