diff options
| author | Arjan van de Ven <arjan@infradead.org> | 2007-06-21 01:23:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-21 19:02:50 -0400 |
| commit | 0864a4e201b1ea442f4c8b887418a29f67e24d30 (patch) | |
| tree | cee5372bb22502e52029543dfb72c571a1e89faa /arch/i386/Kconfig.debug | |
| parent | 79d9a72f87d0a6f910be262a9dd4c36e96972a92 (diff) | |
Allow DEBUG_RODATA and KPROBES to co-exist
Do not mark the kernel text read only if KPROBES is in the kernel;
kprobes needs to hot-patch the kernel text to insert it's
instrumentation.
In this case, only mark the .rodata segment as read only.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Tested-by: S. P. Prasanna <prasanna@in.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: William Cohen <wcohen@redhat.com>
Cc: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/Kconfig.debug')
| -rw-r--r-- | arch/i386/Kconfig.debug | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug index 6293920cd1be..b31c0802e1cc 100644 --- a/arch/i386/Kconfig.debug +++ b/arch/i386/Kconfig.debug | |||
| @@ -49,7 +49,6 @@ config DEBUG_PAGEALLOC | |||
| 49 | config DEBUG_RODATA | 49 | config 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 | ||
| 53 | help | 52 | help |
| 54 | Mark the kernel read-only data as write-protected in the pagetables, | 53 | Mark the kernel read-only data as write-protected in the pagetables, |
| 55 | in order to catch accidental (and incorrect) writes to such const | 54 | in order to catch accidental (and incorrect) writes to such const |