x86: make sure initmem is writable

[linux-2.6] / arch / x86 / mm / init_32.c

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index f7b941c3b2c3872a3ec8b122e6a5def9fefcad53..4d115654519442babfa3e0d2a3f4d4fc3749a9b6 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -752,15 +752,11 @@ void mark_rodata_ro(void)
                printk("Write protecting the kernel text: %luk\n", size >> 10);
 
 #ifdef CONFIG_CPA_DEBUG
-               global_flush_tlb();
-
                printk("Testing CPA: Reverting %lx-%lx\n", start, start+size);
                set_pages_rw(virt_to_page(start), size>>PAGE_SHIFT);
-               global_flush_tlb();
 
                printk("Testing CPA: write protecting again\n");
                set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT);
-               global_flush_tlb();
 #endif
        }
 #endif
@@ -770,22 +766,12 @@ void mark_rodata_ro(void)
        printk("Write protecting the kernel read-only data: %luk\n",
               size >> 10);
 
-       /*
-        * set_pages_*() requires a global_flush_tlb() call after it.
-        * We do this after the printk so that if something went wrong in the
-        * change, the printk gets out at least to give a better debug hint
-        * of who is the culprit.
-        */
-       global_flush_tlb();
-
 #ifdef CONFIG_CPA_DEBUG
        printk("Testing CPA: undo %lx-%lx\n", start, start + size);
        set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT);
-       global_flush_tlb();
 
        printk("Testing CPA: write protecting again\n");
        set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
-       global_flush_tlb();
 #endif
 }
 #endif
@@ -794,6 +780,13 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
 {
        unsigned long addr;
 
+       /*
+        * We just marked the kernel text read only above, now that
+        * we are going to free part of that, we need to make that
+        * writeable first.
+        */
+       set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
+
        for (addr = begin; addr < end; addr += PAGE_SIZE) {
                ClearPageReserved(virt_to_page(addr));
                init_page_count(virt_to_page(addr));