diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-12 09:36:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-12 09:36:18 +0200 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /init | |
| parent | 7142d17e8f935fa842e9f6eece2281b6d41625d6 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
| download | linux-starfive-9cb5baba5e3acba0994ad899ee908799104c9965.tar.gz linux-starfive-9cb5baba5e3acba0994ad899ee908799104c9965.tar.bz2 linux-starfive-9cb5baba5e3acba0994ad899ee908799104c9965.zip | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig index 32745bfe059e..9c812c5fb6e8 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -929,14 +929,6 @@ menuconfig EXPERT environments which can tolerate a "non-standard" kernel. Only use this if you really know what you are doing. -config EMBEDDED - bool "Embedded system" - select EXPERT - help - This option should be enabled if compiling the kernel for - an embedded system so certain expert options are available - for configuration. - config UID16 bool "Enable 16-bit UID system calls" if EXPERT depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) @@ -1109,6 +1101,14 @@ config AIO by some high performance threaded applications. Disabling this option saves about 7k. +config EMBEDDED + bool "Embedded system" + select EXPERT + help + This option should be enabled if compiling the kernel for + an embedded system so certain expert options are available + for configuration. + config HAVE_PERF_EVENTS bool help @@ -1231,6 +1231,7 @@ config SLAB per cpu and per node queues. config SLUB + depends on BROKEN || NUMA || !DISCONTIGMEM bool "SLUB (Unqueued Allocator)" help SLUB is a slab allocator that minimizes cache line usage |