Merge branch 'auto-ftrace-next' into tracing/for-linus

Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 2 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a25cc6fa2207..27de2435e008 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -991,6 +991,13 @@ EXPORT_SYMBOL_GPL(rodata_test_data);
 void mark_rodata_ro(void)
 {
         unsigned long start = PFN_ALIGN(_stext), end = PFN_ALIGN(__end_rodata);
+        unsigned long rodata_start =
+                ((unsigned long)__start_rodata + PAGE_SIZE - 1) & PAGE_MASK;
+
+#ifdef CONFIG_DYNAMIC_FTRACE
+        /* Dynamic tracing modifies the kernel text section */
+        start = rodata_start;
+#endif
 
         printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
                (end - start) >> 10);
@@ -1000,8 +1007,7 @@ void mark_rodata_ro(void)
          * The rodata section (but not the kernel text!) should also be
          * not-executable.
          */
-        start = ((unsigned long)__start_rodata + PAGE_SIZE - 1) & PAGE_MASK;
-        set_memory_nx(start, (end - start) >> PAGE_SHIFT);
+        set_memory_nx(rodata_start, (end - rodata_start) >> PAGE_SHIFT);
 
         rodata_test();