aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/ksysfs.c14
-rw-r--r--kernel/sysctl.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index e975a76a9d5b..bfb4a7a54e22 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -26,23 +26,23 @@ static struct subsys_attribute _name##_attr = \
26/* current uevent sequence number */ 26/* current uevent sequence number */
27static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page) 27static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page)
28{ 28{
29 return sprintf(page, "%llu\n", (unsigned long long)hotplug_seqnum); 29 return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum);
30} 30}
31KERNEL_ATTR_RO(uevent_seqnum); 31KERNEL_ATTR_RO(uevent_seqnum);
32 32
33/* uevent helper program, used during early boo */ 33/* uevent helper program, used during early boo */
34static ssize_t uevent_helper_show(struct subsystem *subsys, char *page) 34static ssize_t uevent_helper_show(struct subsystem *subsys, char *page)
35{ 35{
36 return sprintf(page, "%s\n", hotplug_path); 36 return sprintf(page, "%s\n", uevent_helper);
37} 37}
38static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count) 38static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count)
39{ 39{
40 if (count+1 > HOTPLUG_PATH_LEN) 40 if (count+1 > UEVENT_HELPER_PATH_LEN)
41 return -ENOENT; 41 return -ENOENT;
42 memcpy(hotplug_path, page, count); 42 memcpy(uevent_helper, page, count);
43 hotplug_path[count] = '\0'; 43 uevent_helper[count] = '\0';
44 if (count && hotplug_path[count-1] == '\n') 44 if (count && uevent_helper[count-1] == '\n')
45 hotplug_path[count-1] = '\0'; 45 uevent_helper[count-1] = '\0';
46 return count; 46 return count;
47} 47}
48KERNEL_ATTR_RW(uevent_helper); 48KERNEL_ATTR_RW(uevent_helper);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6a51e25d4466..345f4a1d533f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -395,8 +395,8 @@ static ctl_table kern_table[] = {
395 { 395 {
396 .ctl_name = KERN_HOTPLUG, 396 .ctl_name = KERN_HOTPLUG,
397 .procname = "hotplug", 397 .procname = "hotplug",
398 .data = &hotplug_path, 398 .data = &uevent_helper,
399 .maxlen = HOTPLUG_PATH_LEN, 399 .maxlen = UEVENT_HELPER_PATH_LEN,
400 .mode = 0644, 400 .mode = 0644,
401 .proc_handler = &proc_dostring, 401 .proc_handler = &proc_dostring,
402 .strategy = &sysctl_string, 402 .strategy = &sysctl_string,