[PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem)

[linux-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index a099fc6526d9277cf140c70c04399022ce1aaf43..4381006dd666aaba6f9d1e29913d65fe5c3e5a8c 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -182,23 +182,6 @@ config TASK_DELAY_ACCT
 
          Say N if unsure.
 
-config SYSCTL
-       bool "Sysctl support" if EMBEDDED
-       default y
-       ---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.
-
 config AUDIT
        bool "Auditing support"
        depends on NET
@@ -261,13 +244,6 @@ config RELAY
 
 source "usr/Kconfig"
 
-config UID16
-       bool "Enable 16-bit UID system calls" if EMBEDDED
-       depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
-       default y
-       help
-         This enables the legacy 16-bit UID syscall wrappers.
-
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y
@@ -289,6 +265,33 @@ menuconfig EMBEDDED
           environments which can tolerate a "non-standard" kernel.
           Only use this if you really know what you are doing.
 
+config UID16
+       bool "Enable 16-bit UID system calls" if EMBEDDED
+       depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
+       default y
+       help
+         This enables the legacy 16-bit UID syscall wrappers.
+
+config SYSCTL
+       bool
+
+config SYSCTL_SYSCALL
+       bool "Sysctl syscall support"
+       default n
+       select SYSCTL
+       ---help---
+         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
         default y
@@ -363,10 +366,6 @@ config BASE_FULL
          kernel data structures. This saves memory on small machines,
          but may reduce performance.
 
-config RT_MUTEXES
-       boolean
-       select PLIST
-
 config FUTEX
        bool "Enable futex support" if EMBEDDED
        default y
@@ -414,6 +413,10 @@ config VM_EVENT_COUNTERS
 
 endmenu                # General setup
 
+config RT_MUTEXES
+       boolean
+       select PLIST
+
 config TINY_SHMEM
        default !SHMEM
        bool