Merge branch 'master' into upstream

1 files changed, 17 insertions, 14 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 9a7656f0b5ec..4381006dd666 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -273,21 +273,24 @@ config UID16
           This enables the legacy 16-bit UID syscall wrappers.
 
 config SYSCTL
-        bool "Sysctl support" if EMBEDDED
-        default y
+        bool
+
+config SYSCTL_SYSCALL
+        bool "Sysctl syscall support"
+        default n
+        select SYSCTL
         ---help---
-          The sysctl interface provides a means of dynamically changing
-          certain kernel parameters and variables on the fly without requiring
-          a recompile of the kernel or reboot of the system.  The primary
-          interface consists of a system call, but if you say Y to "/proc
-          file system support", a tree of modifiable sysctl entries will be
-          generated beneath the /proc/sys directory. They are explained in the
-          files in <file:Documentation/sysctl/>.  Note that enabling this
-          option will enlarge the kernel by at least 8 KB.
-
-          As it is generally a good thing, you should say Y here unless
-          building a kernel for install/rescue disks or your system is very
-          limited in memory.
+          Enable the deprecated sysctl system call.  sys_sysctl uses
+          binary paths that have been found to be a major pain to maintain
+          and use.  The interface in /proc/sys is now the primary and what
+          everyone uses.
+
+          Nothing has been using the binary sysctl interface for some time
+          time now so nothing should break if you disable sysctl syscall
+          support, and you kernel will get marginally smaller.
+
+          Unless you have an application that uses the sys_syscall interface
+          you should probably say N here.
 
 config KALLSYMS
          bool "Load all symbols for debugging/kksymoops" if EMBEDDED