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: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
3b572b506c
Коммит
e3a1a5ec5c
|
@ -26,7 +26,6 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
|
||||||
static struct kobj_attribute _name##_attr = \
|
static struct kobj_attribute _name##_attr = \
|
||||||
__ATTR(_name, 0644, _name##_show, _name##_store)
|
__ATTR(_name, 0644, _name##_show, _name##_store)
|
||||||
|
|
||||||
#if defined(CONFIG_HOTPLUG)
|
|
||||||
/* current uevent sequence number */
|
/* current uevent sequence number */
|
||||||
static ssize_t uevent_seqnum_show(struct kobject *kobj,
|
static ssize_t uevent_seqnum_show(struct kobject *kobj,
|
||||||
struct kobj_attribute *attr, char *buf)
|
struct kobj_attribute *attr, char *buf)
|
||||||
|
@ -54,7 +53,7 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
KERNEL_ATTR_RW(uevent_helper);
|
KERNEL_ATTR_RW(uevent_helper);
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_PROFILING
|
#ifdef CONFIG_PROFILING
|
||||||
static ssize_t profiling_show(struct kobject *kobj,
|
static ssize_t profiling_show(struct kobject *kobj,
|
||||||
|
@ -169,10 +168,8 @@ EXPORT_SYMBOL_GPL(kernel_kobj);
|
||||||
|
|
||||||
static struct attribute * kernel_attrs[] = {
|
static struct attribute * kernel_attrs[] = {
|
||||||
&fscaps_attr.attr,
|
&fscaps_attr.attr,
|
||||||
#if defined(CONFIG_HOTPLUG)
|
|
||||||
&uevent_seqnum_attr.attr,
|
&uevent_seqnum_attr.attr,
|
||||||
&uevent_helper_attr.attr,
|
&uevent_helper_attr.attr,
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_PROFILING
|
#ifdef CONFIG_PROFILING
|
||||||
&profiling_attr.attr,
|
&profiling_attr.attr,
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче