Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dcfcda5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Al Viro
Browse files

compat: remove compat_printk() 

After 7e8e385a ("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: default avatarArnd 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0026ba40

fs/compat.c

+0 −14
Original line number Diff line number Diff line
@@ -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.

include/linux/compat.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

kernel/sysctl.c

+0 −10
Original line number Diff line number Diff line
@@ -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
@@ -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",