aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/mm
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2007-06-21 01:23:21 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-21 19:02:50 -0400
commit0864a4e201b1ea442f4c8b887418a29f67e24d30 (patch)
treecee5372bb22502e52029543dfb72c571a1e89faa /arch/x86_64/mm
parent79d9a72f87d0a6f910be262a9dd4c36e96972a92 (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/x86_64/mm')
-rw-r--r--arch/x86_64/mm/init.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index efb6e845114e..9a0e98accf04 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -605,6 +605,11 @@ void mark_rodata_ro(void)
605 if (num_possible_cpus() > 1) 605 if (num_possible_cpus() > 1)
606 start = (unsigned long)_etext; 606 start = (unsigned long)_etext;
607#endif 607#endif
608
609#ifdef CONFIG_KPROBES
610 start = (unsigned long)__start_rodata;
611#endif
612
608 end = (unsigned long)__end_rodata; 613 end = (unsigned long)__end_rodata;
609 start = (start + PAGE_SIZE - 1) & PAGE_MASK; 614 start = (start + PAGE_SIZE - 1) & PAGE_MASK;
610 end &= PAGE_MASK; 615 end &= PAGE_MASK;