aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-01-30 07:34:09 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:34:09 -0500
commit1a4872529e13265d05ffae75b8d09697540016d2 (patch)
tree475ed9bebc20f13ae638bececa881fc5a6ecb3d4
parent4c61afcdb2cd4be299c1442b33adf312b695e2d7 (diff)
x86: move misplaced rodata check call
It looks like a mismerge put the rodata self-check in the wrong spot; move it to the right place after marking the .rodata section read only. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/mm/init_64.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 50d29f5da02b..f51180c02b8f 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -573,7 +573,6 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
573 set_memory_rw(begin, (end - begin)/PAGE_SIZE); 573 set_memory_rw(begin, (end - begin)/PAGE_SIZE);
574 set_memory_np(begin, (end - begin)/PAGE_SIZE); 574 set_memory_np(begin, (end - begin)/PAGE_SIZE);
575 set_memory_nx(begin, (end - begin)/PAGE_SIZE); 575 set_memory_nx(begin, (end - begin)/PAGE_SIZE);
576 rodata_test();
577 } 576 }
578#endif 577#endif
579} 578}
@@ -614,6 +613,8 @@ void mark_rodata_ro(void)
614 printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n", 613 printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
615 (end - start) >> 10); 614 (end - start) >> 10);
616 615
616 rodata_test();
617
617#ifdef CONFIG_CPA_DEBUG 618#ifdef CONFIG_CPA_DEBUG
618 printk("Testing CPA: undo %lx-%lx\n", start, end); 619 printk("Testing CPA: undo %lx-%lx\n", start, end);
619 set_memory_rw(start, (end-start) >> PAGE_SHIFT); 620 set_memory_rw(start, (end-start) >> PAGE_SHIFT);