diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-04-29 03:58:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:01 -0400 |
commit | f17a32e97eaa924754bf4463aee588a3890c7ae0 (patch) | |
tree | 7757809f2968ae4751a81290cdbbb897e7da80d2 /init | |
parent | d5470b596abdd566339b2417e807b1198be64b97 (diff) |
let LOG_BUF_SHIFT default to 17
16 kB is often no longer enough for a normal boot of an UP system.
And even less when people e.g. use suspend.
17 seems to be a more reasonable default for current kernels on current
hardware (it's just the default, anyone who is memory limited can still lower
it).
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig index da071c4bbfb7..e037a5a22b46 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -259,17 +259,14 @@ config IKCONFIG_PROC | |||
259 | config LOG_BUF_SHIFT | 259 | config LOG_BUF_SHIFT |
260 | int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" | 260 | int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" |
261 | range 12 21 | 261 | range 12 21 |
262 | default 17 if S390 || LOCKDEP | 262 | default 17 |
263 | default 16 if X86_NUMAQ || IA64 | ||
264 | default 15 if SMP | ||
265 | default 14 | ||
266 | help | 263 | help |
267 | Select kernel log buffer size as a power of 2. | 264 | Select kernel log buffer size as a power of 2. |
268 | Defaults and Examples: | 265 | Examples: |
269 | 17 => 128 KB for S/390 | 266 | 17 => 128 KB |
270 | 16 => 64 KB for x86 NUMAQ or IA-64 | 267 | 16 => 64 KB |
271 | 15 => 32 KB for SMP | 268 | 15 => 32 KB |
272 | 14 => 16 KB for uniprocessor | 269 | 14 => 16 KB |
273 | 13 => 8 KB | 270 | 13 => 8 KB |
274 | 12 => 4 KB | 271 | 12 => 4 KB |
275 | 272 | ||