diff options
-rw-r--r-- | init/Kconfig | 17 | ||||
-rw-r--r-- | lib/Kconfig.debug | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/init/Kconfig b/init/Kconfig index ebe04f56d834..d0edf42f4dba 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -266,6 +266,23 @@ config IKCONFIG_PROC | |||
266 | This option enables access to the kernel configuration file | 266 | This option enables access to the kernel configuration file |
267 | through /proc/config.gz. | 267 | through /proc/config.gz. |
268 | 268 | ||
269 | config LOG_BUF_SHIFT | ||
270 | int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" | ||
271 | range 12 21 | ||
272 | default 17 if S390 || LOCKDEP | ||
273 | default 16 if X86_NUMAQ || IA64 | ||
274 | default 15 if SMP | ||
275 | default 14 | ||
276 | help | ||
277 | Select kernel log buffer size as a power of 2. | ||
278 | Defaults and Examples: | ||
279 | 17 => 128 KB for S/390 | ||
280 | 16 => 64 KB for x86 NUMAQ or IA-64 | ||
281 | 15 => 32 KB for SMP | ||
282 | 14 => 16 KB for uniprocessor | ||
283 | 13 => 8 KB | ||
284 | 12 => 4 KB | ||
285 | |||
269 | config CPUSETS | 286 | config CPUSETS |
270 | bool "Cpuset support" | 287 | bool "Cpuset support" |
271 | depends on SMP | 288 | depends on SMP |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 9bd002a00484..ee05b8a061b5 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -86,23 +86,6 @@ config DEBUG_SHIRQ | |||
86 | Drivers ought to be able to handle interrupts coming in at those | 86 | Drivers ought to be able to handle interrupts coming in at those |
87 | points; some don't and need to be caught. | 87 | points; some don't and need to be caught. |
88 | 88 | ||
89 | config LOG_BUF_SHIFT | ||
90 | int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL | ||
91 | range 12 21 | ||
92 | default 17 if S390 || LOCKDEP | ||
93 | default 16 if X86_NUMAQ || IA64 | ||
94 | default 15 if SMP | ||
95 | default 14 | ||
96 | help | ||
97 | Select kernel log buffer size as a power of 2. | ||
98 | Defaults and Examples: | ||
99 | 17 => 128 KB for S/390 | ||
100 | 16 => 64 KB for x86 NUMAQ or IA-64 | ||
101 | 15 => 32 KB for SMP | ||
102 | 14 => 16 KB for uniprocessor | ||
103 | 13 => 8 KB | ||
104 | 12 => 4 KB | ||
105 | |||
106 | config DETECT_SOFTLOCKUP | 89 | config DETECT_SOFTLOCKUP |
107 | bool "Detect Soft Lockups" | 90 | bool "Detect Soft Lockups" |
108 | depends on DEBUG_KERNEL && !S390 | 91 | depends on DEBUG_KERNEL && !S390 |