Skip to contentSkip to conversation

sysctl-add-register_sysctl-dummy-helper.patch removed from -mm tree

merged [email protected] 1 participant 1 message Nov 10, 2017

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

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 <[email protected]>
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().

Fixes 38b9aeb32fa7 ("arm64: Port deprecated instruction emulation to new sysctl interface")
Cc Catalin Marinas <[email protected]>
Cc "Luis R. Rodriguez" <[email protected]>
Cc Alex Benne <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc Thomas Gleixner <[email protected]>

---

 include/linux/sysctl.h |    5 +++++
 1 file changed, 5 insertions(+)
include/linux/sysctl.h renamed from include/linux/sysctl.h~sysctl-add-register_sysctl-dummy-helper +5 -0
diff -puN include/linux/sysctl.h~sysctl-add-register_sysctl-dummy-helper 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 [email protected] are

iopoll-avoid-wint-in-bool-context-warning.patch
initramfs-use-time64_t-timestamps.patch
pcmcia-badge4-avoid-unused-function-warning.patch