Commit:     1a4872529e13265d05ffae75b8d09697540016d2
Parent:     4c61afcdb2cd4be299c1442b33adf312b695e2d7
Author:     Arjan van de Ven <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:34:09 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:34:09 2008 +0100

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 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();
@@ -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();
        printk("Testing CPA: undo %lx-%lx\n", start, end);
        set_memory_rw(start, (end-start) >> PAGE_SHIFT);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to