From patchwork Fri Jun 17 14:26:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102163 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp309968qgy; Fri, 17 Jun 2016 07:27:31 -0700 (PDT) X-Received: by 10.66.126.11 with SMTP id mu11mr2817347pab.18.1466173651283; Fri, 17 Jun 2016 07:27:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d186si12734361pfc.62.2016.06.17.07.27.30; Fri, 17 Jun 2016 07:27:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753222AbcFQO13 (ORCPT + 30 others); Fri, 17 Jun 2016 10:27:29 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:49917 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbcFQO11 (ORCPT ); Fri, 17 Jun 2016 10:27:27 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0MUClm-1aoAey0KCg-00QyLK; Fri, 17 Jun 2016 16:27:18 +0200 From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , Alexander Viro , "Theodore Ts'o" , Arnaldo Carvalho de Melo , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] compat: remove compat_printk Date: Fri, 17 Jun 2016 16:26:21 +0200 Message-Id: <20160617142903.3070388-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:r/bF+5eY4mpj0CWMg+I4Xk7nMMNIyJmUWOiWc31+jmFA6/kjM1x 5AJMnbz33dK9T/zduiLH6lWvM3PEmGnEr5JlDbZpTZ2ww7RTZqk/+OoHAiOrfKVWhx9Eub1 /RlOZDrGASNUzNYucLwC6gTpEGVdZcVY7ImZZ2pXdgPKoG3J8vAUiK/HXmbmAQsnv3n9No0 1zuD0j+hGAsTLTjCe84UA== X-UI-Out-Filterresults: notjunk:1; V01:K0:sUL9mmGjrF8=:EdgaW8olCabi+lwrXBiiwz OudxUv4Kd4Yv4VZ239OWzPWMLuz7f9GirZpruDYrPbw8SdeDCcNYtNRT9iF+d82h2eylw1wnX pY94ejTQ2hn4vcQ8r7zLLwuSeHLR383eE+qVBu7qBO4WRJxu7jfSZsJt0g7bGhXhdW/dcQPGG coooyXXVUhR+cfFNHA+B1d7O7b8I+MUMBTycdGcRBuRa6RtM23Zp1Lufwx1bPz07kFLiiCKN6 Q3DnAxk9R/tvu3LC8Jq8rZhWRgvIRherQP4+lAVNnsKNX17NwWFWvbptsG4WC1c2tyv0Qmz9I kLoTIotFlVZMsICjkcTP/oNcCeE29/8tsrZyA9r7sVQQ/odMjyXuTWeO4DeTD4O04+JGpzHPV gvqq/QpOUSsa51fO8uhLnbHJ3HSyUcKNasB6Vy+rjEYLSgof0r/qevqMk/AxEXC0YG0ybY+Xq RHVrkxRR6asgYTE8YTIBUokP9iwvaCpNEMZzOOqDBqj4VLIbXr5qEqv6ihSGQC5RrL9LwF2pn CsmKz43KUyxFqNVK6EUyO1ibtyG0Uv3m2N9SzcSFu97chHZDGQGVzs0CAK7jQchOyrMmZMDg5 YZtMYQn+sr6+r7HMtWf9q42Dt0IPST4WLtcxrTpKDPbe68k3VS5qBRjyojAMGDCkptkit/UsX NvSfAjlRIpesgwycLq2wPkQXa6sD3gxkBI+LklhanZ6SjH2Xc9Au4Ucgj61CSmC/Q6bs= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After 7e8e385aaf6e ("x86/compat: Remove sys32_vm86_warning"), this function has become unused, so we can remove it as well. Signed-off-by: Arnd Bergmann --- fs/compat.c | 14 -------------- include/linux/compat.h | 1 - kernel/sysctl.c | 10 ---------- 3 files changed, 25 deletions(-) -- 2.9.0 diff --git a/fs/compat.c b/fs/compat.c index be6e48b0a46c..e07968974391 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -54,20 +54,6 @@ #include #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. diff --git a/include/linux/compat.h b/include/linux/compat.h index 0c510f25cf99..5adf66de6e6b 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -433,7 +433,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); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 35f0dcb1cb4f..de331c3858e5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -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 int sysctl_nr_open_min, sysctl_nr_open_max; #ifndef CONFIG_MMU @@ -1077,15 +1076,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",