The patch titled
sysctl: ipc fix compilation with CONFIG_SYSCTL_SYSCALL=n
has been removed from the -mm tree. Its filename was
sysctl-fix-sys_sysctl-interface-of-ipc-sysctls-fix-2.patch
This patch was dropped because it was folded into sysctl-fix-sys_sysctl-interface-of-ipc-sysctls.patch
------------------------------------------------------
Subject: sysctl: ipc fix compilation with CONFIG_SYSCTL_SYSCALL=n
From: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
I goofed and failed to handle the CONFIG_SYSCTL_SYSCALL=n
case, with respect to sysctl_ipc_data. The clean fix is to
provide a dummy stub that returns -ENOSYS....
I'm certain there is a better way but not today.
Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/sysctl.c | 6 ++++++
1 files changed, 6 insertions(+)
diff -puN kernel/sysctl.c~sysctl-fix-sys_sysctl-interface-of-ipc-sysctls-fix-2 kernel/sysctl.c
--- a/kernel/sysctl.c~sysctl-fix-sys_sysctl-interface-of-ipc-sysctls-fix-2
+++ a/kernel/sysctl.c
@@ -2742,6 +2742,12 @@ static int sysctl_uts_string(ctl_table *
{
return -ENOSYS;
}
+static int sysctl_ipc_data(ctl_table *table, int __user *name, int nlen,
+ void __user *oldval, size_t __user *oldlenp,
+ void __user *newval, size_t newlen, void **context)
+{
+ return -ENOSYS;
+}
#endif /* CONFIG_SYSCTL_SYSCALL */
/*
_
Patches currently in -mm which might be from ebiederm@xxxxxxxxxxxx are
origin.patch
fix-linux-banner-utsname-information.patch
add-process_session-helper-routine.patch
rename-struct-namespace-to-struct-mnt_namespace.patch
add-an-identifier-to-nsproxy.patch
rename-struct-pspace-to-struct-pid_namespace.patch
add-pid_namespace-to-nsproxy.patch
use-current-nsproxy-pid_ns.patch
add-child-reaper-to-pid_namespace.patch
sysctl-simplify-sysctl_uts_string.patch
sysctl-implement-sysctl_uts_string.patch
sysctl-simplify-ipc-ns-specific-sysctls.patch
sysctl-fix-sys_sysctl-interface-of-ipc-sysctls.patch
sysctl-fix-sys_sysctl-interface-of-ipc-sysctls-fix-2.patch
sysctl-fix-sys_sysctl-interface-of-ipc-sysctls-fix-3.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
