diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-20 19:45:24 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-27 21:20:53 -0400 |
commit | 9dcfcda5768eda793e15a1a73da38cfd1fc1a47a (patch) | |
tree | 13cb9a91b62b997c215acba5f9dd36238f933d58 | |
parent | 0026ba4008e08725a564126d68e076c243fc1e87 (diff) |
compat: remove compat_printk()
After 7e8e385aaf6e ("x86/compat: Remove sys32_vm86_warning"), this
function has become unused, so we can remove it as well.
Link: http://lkml.kernel.org/r/20160617142903.3070388-1-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r-- | fs/compat.c | 14 | ||||
-rw-r--r-- | include/linux/compat.h | 1 | ||||
-rw-r--r-- | kernel/sysctl.c | 10 |
3 files changed, 0 insertions, 25 deletions
diff --git a/fs/compat.c b/fs/compat.c index 5bc3a4b245bb..bd064a2c3550 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -54,20 +54,6 @@ | |||
54 | #include <asm/ioctls.h> | 54 | #include <asm/ioctls.h> |
55 | #include "internal.h" | 55 | #include "internal.h" |
56 | 56 | ||
57 | int compat_log = 1; | ||
58 | |||
59 | int compat_printk(const char *fmt, ...) | ||
60 | { | ||
61 | va_list ap; | ||
62 | int ret; | ||
63 | if (!compat_log) | ||
64 | return 0; | ||
65 | va_start(ap, fmt); | ||
66 | ret = vprintk(fmt, ap); | ||
67 | va_end(ap); | ||
68 | return ret; | ||
69 | } | ||
70 | |||
71 | /* | 57 | /* |
72 | * Not all architectures have sys_utime, so implement this in terms | 58 | * Not all architectures have sys_utime, so implement this in terms |
73 | * of sys_utimes. | 59 | * of sys_utimes. |
diff --git a/include/linux/compat.h b/include/linux/compat.h index f964ef79e0ad..63609398ef9f 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
@@ -432,7 +432,6 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv, | |||
432 | 432 | ||
433 | asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp); | 433 | asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp); |
434 | 434 | ||
435 | extern __printf(1, 2) int compat_printk(const char *fmt, ...); | ||
436 | extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat); | 435 | extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat); |
437 | extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set); | 436 | extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set); |
438 | 437 | ||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index d66321036f21..98ba312d1088 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -106,7 +106,6 @@ extern unsigned int core_pipe_limit; | |||
106 | extern int pid_max; | 106 | extern int pid_max; |
107 | extern int pid_max_min, pid_max_max; | 107 | extern int pid_max_min, pid_max_max; |
108 | extern int percpu_pagelist_fraction; | 108 | extern int percpu_pagelist_fraction; |
109 | extern int compat_log; | ||
110 | extern int latencytop_enabled; | 109 | extern int latencytop_enabled; |
111 | extern unsigned int sysctl_nr_open_min, sysctl_nr_open_max; | 110 | extern unsigned int sysctl_nr_open_min, sysctl_nr_open_max; |
112 | #ifndef CONFIG_MMU | 111 | #ifndef CONFIG_MMU |
@@ -1084,15 +1083,6 @@ static struct ctl_table kern_table[] = { | |||
1084 | .extra1 = &neg_one, | 1083 | .extra1 = &neg_one, |
1085 | }, | 1084 | }, |
1086 | #endif | 1085 | #endif |
1087 | #ifdef CONFIG_COMPAT | ||
1088 | { | ||
1089 | .procname = "compat-log", | ||
1090 | .data = &compat_log, | ||
1091 | .maxlen = sizeof (int), | ||
1092 | .mode = 0644, | ||
1093 | .proc_handler = proc_dointvec, | ||
1094 | }, | ||
1095 | #endif | ||
1096 | #ifdef CONFIG_RT_MUTEXES | 1086 | #ifdef CONFIG_RT_MUTEXES |
1097 | { | 1087 | { |
1098 | .procname = "max_lock_depth", | 1088 | .procname = "max_lock_depth", |