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

Commit e3a1a5ec authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

kernel/ksysfs.c: remove CONFIG_HOTPLUG ifdefs 



Remove conditional code based on CONFIG_HOTPLUG being false.  It's
always on now in preparation of it going away as an option.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b572b50

kernel/ksysfs.c

+1 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) 
static struct kobj_attribute _name##_attr = \

	__ATTR(_name, 0644, _name##_show, _name##_store)



#if defined(CONFIG_HOTPLUG)

/* current uevent sequence number */

static ssize_t uevent_seqnum_show(struct kobject *kobj,

				  struct kobj_attribute *attr, char *buf)
@@ -54,7 +53,7 @@ static ssize_t uevent_helper_store(struct kobject *kobj, 
	return count;

}

KERNEL_ATTR_RW(uevent_helper);

#endif





#ifdef CONFIG_PROFILING

static ssize_t profiling_show(struct kobject *kobj,
@@ -169,10 +168,8 @@ EXPORT_SYMBOL_GPL(kernel_kobj); 


static struct attribute * kernel_attrs[] = {

	&fscaps_attr.attr,

#if defined(CONFIG_HOTPLUG)

	&uevent_seqnum_attr.attr,

	&uevent_helper_attr.attr,

#endif

#ifdef CONFIG_PROFILING

	&profiling_attr.attr,

#endif