From: akpm@linux-foundation.org Subject: [merged] sysctl-fix-unused-function-warning.patch removed from -mm tree Date: Thu, 07 May 2020 09:55:46 -0700 Message-ID: <20200507165546.wDLX54JIF%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:57524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726308AbgEGQzr (ORCPT ); Thu, 7 May 2020 12:55:47 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: andriin@fb.com, arnd@arndb.de, ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, kafai@fb.com, keescook@chromium.org, kpsingh@chromium.org, mcgrof@kernel.org, mm-commits@vger.kernel.org, songliubraving@fb.com, yhs@fb.com, yzaikin@google.com The patch titled Subject: kernel/sysctl.c: fix unused function warning has been removed from the -mm tree. Its filename was sysctl-fix-unused-function-warning.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Arnd Bergmann Subject: kernel/sysctl.c: fix unused function warning The newly added bpf_stats_handler() has the wrong #ifdef check around it, leading to an unused-function warning when CONFIG_SYSCTL is disabled: kernel/sysctl.c:205:12: error: unused function 'bpf_stats_handler' [-Werror,-Wunused-function] static int bpf_stats_handler(struct ctl_table *table, int write, Fix the check to match the reference. Link: http://lkml.kernel.org/r/20200505140734.503701-1-arnd@arndb.de Fixes: d46edd671a14 ("bpf: Sharing bpf runtime stats with BPF_ENABLE_STATS") Signed-off-by: Arnd Bergmann Reviewed-by: Luis Chamberlain Acked-by: Song Liu Cc: Kees Cook Cc: Iurii Zaikin Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Martin KaFai Lau Cc: Yonghong Song Cc: Andrii Nakryiko Cc: John Fastabend Cc: KP Singh Signed-off-by: Andrew Morton --- kernel/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/sysctl.c~sysctl-fix-unused-function-warning +++ a/kernel/sysctl.c @@ -201,7 +201,7 @@ static int max_extfrag_threshold = 1000; #endif /* CONFIG_SYSCTL */ -#ifdef CONFIG_BPF_SYSCALL +#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL) static int bpf_stats_handler(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) _ Patches currently in -mm which might be from arnd@arndb.de are arm64-add-support-for-folded-p4d-page-tables-fix.patch bitops-avoid-clang-shift-count-overflow-warnings.patch ubsan-fix-gcc-10-warnings.patch initramfs-fix-another-section-mismatch.patch