aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-06-20 06:23:35 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-20 17:27:26 -0400
commit55181000cd60334fe920c65ffbcdfe0e3f1de406 (patch)
tree64ecf0214b425e42013b631d8acdcacfafa43048 /arch/i386
parent9f1f79e641c548ee93fb20f69c9a404b92ee4fdd (diff)
x86: Disable KPROBES with DEBUG_RODATA for now
Right now Kprobes cannot write to the write protected kernel text when DEBUG_RODATA is enabled. Disallow this in Kconfig for now. Temporary fix for 2.6.22. In .23 add code to temporarily unprotect it. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/Kconfig.debug1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index b31c0802e1cc..6293920cd1be 100644
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -49,6 +49,7 @@ config DEBUG_PAGEALLOC
49config DEBUG_RODATA 49config DEBUG_RODATA
50 bool "Write protect kernel read-only data structures" 50 bool "Write protect kernel read-only data structures"
51 depends on DEBUG_KERNEL 51 depends on DEBUG_KERNEL
52 depends on !KPROBES # temporary for 2.6.22
52 help 53 help
53 Mark the kernel read-only data as write-protected in the pagetables, 54 Mark the kernel read-only data as write-protected in the pagetables,
54 in order to catch accidental (and incorrect) writes to such const 55 in order to catch accidental (and incorrect) writes to such const