The patch titled
proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers
has been added to the -mm tree. Its filename is
proc_sysctl-use-config_proc_sysctl-around-ipc-and-utsname-proc_handlers.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers
From: "Serge E. Hallyn" <serue@xxxxxxxxxx>
As pointed out by Cedric Le Goater (in response to Alexey's original
comment wrt mqns), ipc_sysctl.c and utsname_sysctl.c are using
CONFIG_PROC_FS, not CONFIG_PROC_SYSCTL, to determine whether to define
the proc_handlers. Change that.
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Cc: Cedric Le Goater <clg@xxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/ipc_sysctl.c | 2 +-
kernel/utsname_sysctl.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN ipc/ipc_sysctl.c~proc_sysctl-use-config_proc_sysctl-around-ipc-and-utsname-proc_handlers ipc/ipc_sysctl.c
--- a/ipc/ipc_sysctl.c~proc_sysctl-use-config_proc_sysctl-around-ipc-and-utsname-proc_handlers
+++ a/ipc/ipc_sysctl.c
@@ -26,7 +26,7 @@ static void *get_ipc(ctl_table *table)
return which;
}
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_PROC_SYSCTL
static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
diff -puN kernel/utsname_sysctl.c~proc_sysctl-use-config_proc_sysctl-around-ipc-and-utsname-proc_handlers kernel/utsname_sysctl.c
--- a/kernel/utsname_sysctl.c~proc_sysctl-use-config_proc_sysctl-around-ipc-and-utsname-proc_handlers
+++ a/kernel/utsname_sysctl.c
@@ -37,7 +37,7 @@ static void put_uts(ctl_table *table, in
up_write(&uts_sem);
}
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_PROC_SYSCTL
/*
* Special case of dostring for the UTS structure. This has locks
* to observe. Should this be in kernel/sys.c ????
_
Patches currently in -mm which might be from serue@xxxxxxxxxx are
fix-recursive-lock-in-free_uid-free_user_ns.patch
linux-next.patch
vfs-simple_set_mnt-should-return-void.patch
relax-ns_can_attach-checks-to-allow-attaching-to-grandchild-cgroups.patch
proc_sysctl-use-config_proc_sysctl-around-ipc-and-utsname-proc_handlers.patch
pids-kill-now-unused-signal_struct-__pgrp-__session-and-friends.patch
namespaces-move-proc_net_get_sb-to-a-generic-fs-superc-helper.patch
namespaces-mqueue-ns-move-mqueue_mnt-into-struct-ipc_namespace.patch
namespaces-ipc-namespaces-implement-support-for-posix-msqueues.patch
namespaces-mqueue-namespace-adapt-sysctl.patch
namespaces-mqueue-namespace-adapt-sysctl-update.patch
namespaces-mqueue-namespace-adapt-sysctl-update-fix.patch
reiser4.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
