diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 14:50:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 14:50:35 +1000 |
| commit | 5c701c60b7040829b81d17d81e49ebbfb3a6b33a (patch) | |
| tree | 24de6cf0784bd30e71c5c3cb63b242c9c281af75 /kernel | |
| parent | bce01ed856edb6f73d2d0d8be7e716137c87d518 (diff) | |
| parent | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/ksysfs.c | 5 | ||||
| -rw-r--r-- | kernel/sysctl.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 2495a9b14ac8..6683ccef9fff 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c @@ -37,6 +37,7 @@ static ssize_t uevent_seqnum_show(struct kobject *kobj, } KERNEL_ATTR_RO(uevent_seqnum); +#ifdef CONFIG_UEVENT_HELPER /* uevent helper program, used during early boot */ static ssize_t uevent_helper_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) @@ -56,7 +57,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, @@ -189,7 +190,9 @@ EXPORT_SYMBOL_GPL(kernel_kobj); static struct attribute * kernel_attrs[] = { &fscaps_attr.attr, &uevent_seqnum_attr.attr, +#ifdef CONFIG_UEVENT_HELPER &uevent_helper_attr.attr, +#endif #ifdef CONFIG_PROFILING &profiling_attr.attr, #endif diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 3ca6b48d39b9..580044080803 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -643,7 +643,7 @@ static struct ctl_table kern_table[] = { .extra2 = &one, }, #endif - +#ifdef CONFIG_UEVENT_HELPER { .procname = "hotplug", .data = &uevent_helper, @@ -651,7 +651,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dostring, }, - +#endif #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", |