summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-04 16:11:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 16:54:15 -0700
commit95583e4ab5745218373add88ffddb70faff2d0c8 (patch)
tree76de18e06ecd5c46dde90a98ed9135f6c8b5f1c8
parent616feab753972b9751308f3cd2a68fc57eae8edb (diff)
downloadop-kernel-dev-95583e4ab5745218373add88ffddb70faff2d0c8.zip
op-kernel-dev-95583e4ab5745218373add88ffddb70faff2d0c8.tar.gz
kernel/utsname_sysctl.c: replace obsolete __initcall by device_initcall
Also fixes checkpatch warnings on proc_dostring function parameters Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/utsname_sysctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index 4f69f9a..6fbe811 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -51,7 +51,7 @@ static int proc_do_uts_string(ctl_table *table, int write,
int r;
memcpy(&uts_table, table, sizeof(uts_table));
uts_table.data = get_uts(table, write);
- r = proc_dostring(&uts_table,write,buffer,lenp, ppos);
+ r = proc_dostring(&uts_table, write, buffer, lenp, ppos);
put_uts(table, write, uts_table.data);
if (write)
@@ -135,4 +135,4 @@ static int __init utsname_sysctl_init(void)
return 0;
}
-__initcall(utsname_sysctl_init);
+device_initcall(utsname_sysctl_init);
OpenPOWER on IntegriCloud