diff options
Diffstat (limited to 'kernel/utsname_sysctl.c')
-rw-r--r-- | kernel/utsname_sysctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c index 4f69f9a5e221..c8eac43267e9 100644 --- a/kernel/utsname_sysctl.c +++ b/kernel/utsname_sysctl.c | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #ifdef CONFIG_PROC_SYSCTL | 18 | #ifdef CONFIG_PROC_SYSCTL |
19 | 19 | ||
20 | static void *get_uts(ctl_table *table, int write) | 20 | static void *get_uts(struct ctl_table *table, int write) |
21 | { | 21 | { |
22 | char *which = table->data; | 22 | char *which = table->data; |
23 | struct uts_namespace *uts_ns; | 23 | struct uts_namespace *uts_ns; |
@@ -32,7 +32,7 @@ static void *get_uts(ctl_table *table, int write) | |||
32 | return which; | 32 | return which; |
33 | } | 33 | } |
34 | 34 | ||
35 | static void put_uts(ctl_table *table, int write, void *which) | 35 | static void put_uts(struct ctl_table *table, int write, void *which) |
36 | { | 36 | { |
37 | if (!write) | 37 | if (!write) |
38 | up_read(&uts_sem); | 38 | up_read(&uts_sem); |
@@ -44,14 +44,14 @@ static void put_uts(ctl_table *table, int write, void *which) | |||
44 | * Special case of dostring for the UTS structure. This has locks | 44 | * Special case of dostring for the UTS structure. This has locks |
45 | * to observe. Should this be in kernel/sys.c ???? | 45 | * to observe. Should this be in kernel/sys.c ???? |
46 | */ | 46 | */ |
47 | static int proc_do_uts_string(ctl_table *table, int write, | 47 | static int proc_do_uts_string(struct ctl_table *table, int write, |
48 | void __user *buffer, size_t *lenp, loff_t *ppos) | 48 | void __user *buffer, size_t *lenp, loff_t *ppos) |
49 | { | 49 | { |
50 | struct ctl_table uts_table; | 50 | struct ctl_table uts_table; |
51 | int r; | 51 | int r; |
52 | memcpy(&uts_table, table, sizeof(uts_table)); | 52 | memcpy(&uts_table, table, sizeof(uts_table)); |
53 | uts_table.data = get_uts(table, write); | 53 | uts_table.data = get_uts(table, write); |
54 | r = proc_dostring(&uts_table,write,buffer,lenp, ppos); | 54 | r = proc_dostring(&uts_table, write, buffer, lenp, ppos); |
55 | put_uts(table, write, uts_table.data); | 55 | put_uts(table, write, uts_table.data); |
56 | 56 | ||
57 | if (write) | 57 | if (write) |
@@ -135,4 +135,4 @@ static int __init utsname_sysctl_init(void) | |||
135 | return 0; | 135 | return 0; |
136 | } | 136 | } |
137 | 137 | ||
138 | __initcall(utsname_sysctl_init); | 138 | device_initcall(utsname_sysctl_init); |