diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /init/Kconfig | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4381006dd66..f7a04d0daf0 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -92,7 +92,7 @@ config LOCALVERSION_AUTO config SWAP bool "Support for paging of anonymous memory (swap)" - depends on MMU + depends on MMU && BLOCK default y help This option allows you to choose whether you want to have support @@ -202,7 +202,7 @@ config AUDITSYSCALL ensure that INOTIFY is configured. config IKCONFIG - bool "Kernel .config support" + tristate "Kernel .config support" ---help--- This option enables the complete Linux kernel ".config" file contents to be saved in the kernel. It provides documentation @@ -257,6 +257,18 @@ config CC_OPTIMIZE_FOR_SIZE If unsure, say N. +config TASK_XACCT + bool "Enable extended accounting over taskstats (EXPERIMENTAL)" + depends on TASKSTATS + help + Collect extended task accounting data and send the data + to userland for processing over the taskstats interface. + + Say N if unsure. + +config SYSCTL + bool + menuconfig EMBEDDED bool "Configure standard kernel features (for small systems)" help @@ -272,11 +284,8 @@ config UID16 help This enables the legacy 16-bit UID syscall wrappers. -config SYSCTL - bool - config SYSCTL_SYSCALL - bool "Sysctl syscall support" + bool "Sysctl syscall support" if EMBEDDED default n select SYSCTL ---help--- @@ -285,11 +294,11 @@ config SYSCTL_SYSCALL 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 + Nothing has been using the binary sysctl interface for some time now so nothing should break if you disable sysctl syscall - support, and you kernel will get marginally smaller. + support, and your kernel will get marginally smaller. - Unless you have an application that uses the sys_syscall interface + Unless you have an application that uses the sys_sysctl interface you should probably say N here. config KALLSYMS |