diff options
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/init/Kconfig b/init/Kconfig index f0e62e5ce0dc..6135d07f31ec 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -316,9 +316,16 @@ config CPUSETS | |||
316 | 316 | ||
317 | Say N if unsure. | 317 | Say N if unsure. |
318 | 318 | ||
319 | # | ||
320 | # Architectures with an unreliable sched_clock() should select this: | ||
321 | # | ||
322 | config HAVE_UNSTABLE_SCHED_CLOCK | ||
323 | bool | ||
324 | |||
319 | config GROUP_SCHED | 325 | config GROUP_SCHED |
320 | bool "Group CPU scheduler" | 326 | bool "Group CPU scheduler" |
321 | default y | 327 | depends on EXPERIMENTAL |
328 | default n | ||
322 | help | 329 | help |
323 | This feature lets CPU scheduler recognize task groups and control CPU | 330 | This feature lets CPU scheduler recognize task groups and control CPU |
324 | bandwidth allocation to such task groups. | 331 | bandwidth allocation to such task groups. |
@@ -326,7 +333,7 @@ config GROUP_SCHED | |||
326 | config FAIR_GROUP_SCHED | 333 | config FAIR_GROUP_SCHED |
327 | bool "Group scheduling for SCHED_OTHER" | 334 | bool "Group scheduling for SCHED_OTHER" |
328 | depends on GROUP_SCHED | 335 | depends on GROUP_SCHED |
329 | default y | 336 | default GROUP_SCHED |
330 | 337 | ||
331 | config RT_GROUP_SCHED | 338 | config RT_GROUP_SCHED |
332 | bool "Group scheduling for SCHED_RR/FIFO" | 339 | bool "Group scheduling for SCHED_RR/FIFO" |
@@ -627,6 +634,14 @@ config ELF_CORE | |||
627 | help | 634 | help |
628 | Enable support for generating core dumps. Disabling saves about 4k. | 635 | Enable support for generating core dumps. Disabling saves about 4k. |
629 | 636 | ||
637 | config PCSPKR_PLATFORM | ||
638 | bool "Enable PC-Speaker support" if EMBEDDED | ||
639 | depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES | ||
640 | default y | ||
641 | help | ||
642 | This option allows to disable the internal PC-Speaker | ||
643 | support, saving some memory. | ||
644 | |||
630 | config COMPAT_BRK | 645 | config COMPAT_BRK |
631 | bool "Disable heap randomization" | 646 | bool "Disable heap randomization" |
632 | default y | 647 | default y |
@@ -830,9 +845,9 @@ config MODULE_FORCE_LOAD | |||
830 | depends on MODULES | 845 | depends on MODULES |
831 | default n | 846 | default n |
832 | help | 847 | help |
833 | This option allows loading of modules even if that would set the | 848 | Allow loading of modules without version information (ie. modprobe |
834 | 'F' (forced) taint, due to lack of version info. Which is | 849 | --force). Forced module loading sets the 'F' (forced) taint flag and |
835 | usually a really bad idea. | 850 | is usually a really bad idea. |
836 | 851 | ||
837 | config MODULE_UNLOAD | 852 | config MODULE_UNLOAD |
838 | bool "Module unloading" | 853 | bool "Module unloading" |