Skip to content

Commit

Permalink
compat: remove compat_printk()
Browse files Browse the repository at this point in the history
After 7e8e385 ("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>
  • Loading branch information
arndb authored and Al Viro committed Sep 28, 2016
1 parent 0026ba4 commit 9dcfcda
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 25 deletions.
14 changes: 0 additions & 14 deletions fs/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,6 @@
#include <asm/ioctls.h>
#include "internal.h"

int compat_log = 1;

int compat_printk(const char *fmt, ...)
{
va_list ap;
int ret;
if (!compat_log)
return 0;
va_start(ap, fmt);
ret = vprintk(fmt, ap);
va_end(ap);
return ret;
}

/*
* Not all architectures have sys_utime, so implement this in terms
* of sys_utimes.
Expand Down
1 change: 0 additions & 1 deletion include/linux/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv,

asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);

extern __printf(1, 2) int compat_printk(const char *fmt, ...);
extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);
extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);

Expand Down
10 changes: 0 additions & 10 deletions kernel/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ extern unsigned int core_pipe_limit;
extern int pid_max;
extern int pid_max_min, pid_max_max;
extern int percpu_pagelist_fraction;
extern int compat_log;
extern int latencytop_enabled;
extern unsigned int sysctl_nr_open_min, sysctl_nr_open_max;
#ifndef CONFIG_MMU
Expand Down Expand Up @@ -1084,15 +1083,6 @@ static struct ctl_table kern_table[] = {
.extra1 = &neg_one,
},
#endif
#ifdef CONFIG_COMPAT
{
.procname = "compat-log",
.data = &compat_log,
.maxlen = sizeof (int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
#endif
#ifdef CONFIG_RT_MUTEXES
{
.procname = "max_lock_depth",
Expand Down

0 comments on commit 9dcfcda

Please sign in to comment.