aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-01-09 23:54:51 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:02:02 -0500
commitf346f4b373aa320fb0337a3b504e3fb5344abc0b (patch)
tree7f8d732b17036d4a063e54d507d2dd71b527df40
parent4c29c4c5f28616f2a87f0e6499aa9776d9be58ad (diff)
[PATCH] let MAGIC_SYSRQ no longer depend on DEBUG_KERNEL
I know several people using MAGIC_SYSRQ not for kernel debugging but for trying to do a halfway normal shutdown in case of problems. Since there's no technical reason why MAGIC_SYSRQ would have to depend on DEBUG_KERNEL, I'm therefore suggesting to drop this dependency. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--lib/Kconfig.debug14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1fcd856edec1..a609235a517f 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -9,15 +9,9 @@ config PRINTK_TIME
9 in kernel startup. 9 in kernel startup.
10 10
11 11
12config DEBUG_KERNEL
13 bool "Kernel debugging"
14 help
15 Say Y here if you are developing drivers or trying to debug and
16 identify kernel problems.
17
18config MAGIC_SYSRQ 12config MAGIC_SYSRQ
19 bool "Magic SysRq key" 13 bool "Magic SysRq key"
20 depends on DEBUG_KERNEL && !UML 14 depends on !UML
21 help 15 help
22 If you say Y here, you will have some control over the system even 16 If you say Y here, you will have some control over the system even
23 if the system crashes for example during kernel debugging (e.g., you 17 if the system crashes for example during kernel debugging (e.g., you
@@ -29,6 +23,12 @@ config MAGIC_SYSRQ
29 keys are documented in <file:Documentation/sysrq.txt>. Don't say Y 23 keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
30 unless you really know what this hack does. 24 unless you really know what this hack does.
31 25
26config DEBUG_KERNEL
27 bool "Kernel debugging"
28 help
29 Say Y here if you are developing drivers or trying to debug and
30 identify kernel problems.
31
32config LOG_BUF_SHIFT 32config LOG_BUF_SHIFT
33 int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL 33 int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
34 range 12 21 34 range 12 21