From ac6a890c5dbe6a0640f288a936e3fd82bc00ce3c Mon Sep 17 00:00:00 2001
From: Alistair John Strachan <s0348365@sms.ed.ac.uk>
Date: Tue, 8 May 2007 00:31:15 -0700
Subject: [PATCH] --- yaml --- r: 54717 b: refs/heads/master c:
 794543a236074f49a8af89ef08ef6a753e4777e5 h: refs/heads/master i:   54715:
 610516055202496601f43e41445b9734ed3126a7 v: v3

---
 [refs]                  |  2 +-
 trunk/init/Kconfig      | 17 +++++++++++++++++
 trunk/lib/Kconfig.debug | 17 -----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index c9d03e376647..f3f544f9625e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63f6564d351fb2e7222e43b6dd22737edf9f4a91
+refs/heads/master: 794543a236074f49a8af89ef08ef6a753e4777e5
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index ebe04f56d834..d0edf42f4dba 100644
--- a/trunk/init/Kconfig
+++ b/trunk/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/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 9bd002a00484..ee05b8a061b5 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/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