* [merged] sysctl-add-register_sysctl-dummy-helper.patch removed from -mm tree
@ 2017-11-10 22:21 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2017-11-10 22:21 UTC (permalink / raw)
To: alex.bennee, arnd, catalin.marinas, Dave.Martin, ebiederm,
keescook, mcgrof, mm-commits, tglx, will.deacon
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 <arnd@arndb.de>
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 <arnd@arndb.de>
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: "Luis R. Rodriguez" <mcgrof@kernel.org>
Cc: Alex Benne <alex.bennee@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-11-10 22:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-10 22:21 [merged] sysctl-add-register_sysctl-dummy-helper.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).