From: akpm@linux-foundation.org Subject: [merged] sysctl-add-register_sysctl-dummy-helper.patch removed from -mm tree Date: Fri, 10 Nov 2017 14:21:49 -0800 Message-ID: <20171110222149.--FnTT73N%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54786 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754022AbdKJWVv (ORCPT ); Fri, 10 Nov 2017 17:21:51 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: alex.bennee@linaro.org, arnd@arndb.de, catalin.marinas@arm.com, Dave.Martin@arm.com, ebiederm@xmission.com, keescook@chromium.org, mcgrof@kernel.org, mm-commits@vger.kernel.org, tglx@linutronix.de, will.deacon@arm.com The patch titled Subject: sysctl: add register_sysctl() dummy helper has been removed from the -mm tree. Its filename was sysctl-add-register_sysctl-dummy-helper.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Arnd Bergmann Subject: sysctl: add register_sysctl() dummy helper register_sysctl() has been around for five years with commit fea478d4101a ("sysctl: Add register_sysctl for normal sysctl users") but now that arm64 started using it, I ran into a compile error: arch/arm64/kernel/armv8_deprecated.c: In function 'register_insn_emulation_sysctl': arch/arm64/kernel/armv8_deprecated.c:257:2: error: implicit declaration of function 'register_sysctl' This adds a inline function like we already have for register_sysctl_paths() and register_sysctl_table(). Link: http://lkml.kernel.org/r/20171106133700.558647-1-arnd@arndb.de Fixes: 38b9aeb32fa7 ("arm64: Port deprecated instruction emulation to new sysctl interface") Signed-off-by: Arnd Bergmann Reviewed-by: Dave Martin Acked-by: Kees Cook Acked-by: Will Deacon Cc: Catalin Marinas Cc: "Luis R. Rodriguez" Cc: Alex Benne Cc: Arnd Bergmann Cc: "Eric W. Biederman" Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- include/linux/sysctl.h | 5 +++++ 1 file changed, 5 insertions(+) diff -puN include/linux/sysctl.h~sysctl-add-register_sysctl-dummy-helper include/linux/sysctl.h --- a/include/linux/sysctl.h~sysctl-add-register_sysctl-dummy-helper +++ a/include/linux/sysctl.h @@ -213,6 +213,11 @@ static inline struct ctl_table_header *r return NULL; } +static inline struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table) +{ + return NULL; +} + static inline void unregister_sysctl_table(struct ctl_table_header * table) { } _ Patches currently in -mm which might be from arnd@arndb.de are iopoll-avoid-wint-in-bool-context-warning.patch initramfs-use-time64_t-timestamps.patch pcmcia-badge4-avoid-unused-function-warning.patch