diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-01-30 13:34:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:09 +0100 |
| commit | 1a4872529e13265d05ffae75b8d09697540016d2 (patch) | |
| tree | 475ed9bebc20f13ae638bececa881fc5a6ecb3d4 /arch | |
| parent | 4c61afcdb2cd4be299c1442b33adf312b695e2d7 (diff) | |
| download | kernel_goldelico_gta04-1a4872529e13265d05ffae75b8d09697540016d2.zip kernel_goldelico_gta04-1a4872529e13265d05ffae75b8d09697540016d2.tar.gz kernel_goldelico_gta04-1a4872529e13265d05ffae75b8d09697540016d2.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/init_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 50d29f5..f51180c 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) set_memory_rw(begin, (end - begin)/PAGE_SIZE); set_memory_np(begin, (end - begin)/PAGE_SIZE); set_memory_nx(begin, (end - begin)/PAGE_SIZE); - rodata_test(); } #endif } @@ -614,6 +613,8 @@ void mark_rodata_ro(void) printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n", (end - start) >> 10); + rodata_test(); + #ifdef CONFIG_CPA_DEBUG printk("Testing CPA: undo %lx-%lx\n", start, end); set_memory_rw(start, (end-start) >> PAGE_SHIFT); |