Move LOG_BUF_SHIFT to a more sensible place

Several people have observed that perhaps LOG_BUF_SHIFT should be in a more
obvious place than under DEBUG_KERNEL. Under some circumstances (such as the
PARISC architecture), DEBUG_KERNEL can increase kernel size, which is an
undesirable trade off for something as trivial as increasing the kernel log
buffer size.

Instead, move LOG_BUF_SHIFT into "General Setup", so that people are more
likely to be able to change it such a circumstance that the default buffer
size is insufficient.

Signed-off-by: Alistair John Strachan <s0348365@sms.ed.ac.uk>
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>

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
           This option enables access to the kernel configuration file
           through /proc/config.gz.
 
+config LOG_BUF_SHIFT
+        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
+        range 12 21
+        default 17 if S390 || LOCKDEP
+        default 16 if X86_NUMAQ || IA64
+        default 15 if SMP
+        default 14
+        help
+          Select kernel log buffer size as a power of 2.
+          Defaults and Examples:
+                     17 => 128 KB for S/390
+                     16 => 64 KB for x86 NUMAQ or IA-64
+                     15 => 32 KB for SMP
+                     14 => 16 KB for uniprocessor
+                     13 =>  8 KB
+                     12 =>  4 KB
+
 config CPUSETS
         bool "Cpuset support"
         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
           Drivers ought to be able to handle interrupts coming in at those
           points; some don't and need to be caught.
 
-config LOG_BUF_SHIFT
-        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
-        range 12 21
-        default 17 if S390 || LOCKDEP
-        default 16 if X86_NUMAQ || IA64
-        default 15 if SMP
-        default 14
-        help
-          Select kernel log buffer size as a power of 2.
-          Defaults and Examples:
-                     17 => 128 KB for S/390
-                     16 => 64 KB for x86 NUMAQ or IA-64
-                     15 => 32 KB for SMP
-                     14 => 16 KB for uniprocessor
-                     13 =>  8 KB
-                     12 =>  4 KB
-
 config DETECT_SOFTLOCKUP
         bool "Detect Soft Lockups"
         depends on DEBUG_KERNEL && !S390