mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge commit 'v2.6.39-rc7' into sched/core
This commit is contained in:
commit
9cb5baba5e
560 changed files with 6272 additions and 3254 deletions
17
init/Kconfig
17
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue