1 files changed, 28 insertions, 7 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5a4398a6006b..5198b9bb34ef 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -568,7 +568,8 @@ kernel_physical_mapping_init(unsigned long start,
 }
 
 #ifndef CONFIG_NUMA
-void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn)
+void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,
+                                int acpi, int k8)
 {
         unsigned long bootmap_size, bootmap;
 
@@ -694,12 +695,12 @@ void __init mem_init(void)
 const int rodata_test_data = 0xC3;
 EXPORT_SYMBOL_GPL(rodata_test_data);
 
-static int kernel_set_to_readonly;
+int kernel_set_to_readonly;
 
 void set_kernel_text_rw(void)
 {
-        unsigned long start = PFN_ALIGN(_stext);
-        unsigned long end = PFN_ALIGN(__start_rodata);
+        unsigned long start = PFN_ALIGN(_text);
+        unsigned long end = PFN_ALIGN(__stop___ex_table);
 
         if (!kernel_set_to_readonly)
                 return;
@@ -707,13 +708,18 @@ void set_kernel_text_rw(void)
         pr_debug("Set kernel text: %lx - %lx for read write\n",
                  start, end);
 
+        /*
+         * Make the kernel identity mapping for text RW. Kernel text
+         * mapping will always be RO. Refer to the comment in
+         * static_protections() in pageattr.c
+         */
         set_memory_rw(start, (end - start) >> PAGE_SHIFT);
 }
 
 void set_kernel_text_ro(void)
 {
-        unsigned long start = PFN_ALIGN(_stext);
-        unsigned long end = PFN_ALIGN(__start_rodata);
+        unsigned long start = PFN_ALIGN(_text);
+        unsigned long end = PFN_ALIGN(__stop___ex_table);
 
         if (!kernel_set_to_readonly)
                 return;
@@ -721,14 +727,21 @@ void set_kernel_text_ro(void)
         pr_debug("Set kernel text: %lx - %lx for read only\n",
                  start, end);
 
+        /*
+         * Set the kernel identity mapping for text RO.
+         */
         set_memory_ro(start, (end - start) >> PAGE_SHIFT);
 }
 
 void mark_rodata_ro(void)
 {
-        unsigned long start = PFN_ALIGN(_stext), end = PFN_ALIGN(__end_rodata);
+        unsigned long start = PFN_ALIGN(_text);
         unsigned long rodata_start =
                 ((unsigned long)__start_rodata + PAGE_SIZE - 1) & PAGE_MASK;
+        unsigned long end = (unsigned long) &__end_rodata_hpage_align;
+        unsigned long text_end = PAGE_ALIGN((unsigned long) &__stop___ex_table);
+        unsigned long rodata_end = PAGE_ALIGN((unsigned long) &__end_rodata);
+        unsigned long data_start = (unsigned long) &_sdata;
 
         printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
                (end - start) >> 10);
@@ -751,6 +764,14 @@ void mark_rodata_ro(void)
         printk(KERN_INFO "Testing CPA: again\n");
         set_memory_ro(start, (end-start) >> PAGE_SHIFT);
 #endif
+
+        free_init_pages("unused kernel memory",
+                        (unsigned long) page_address(virt_to_page(text_end)),
+                        (unsigned long)
+                                 page_address(virt_to_page(rodata_start)));
+        free_init_pages("unused kernel memory",
+                        (unsigned long) page_address(virt_to_page(rodata_end)),
+                        (unsigned long) page_address(virt_to_page(data_start)));
 }
 
 #endif