x86: convert CPA users to the new set_page_ API

This patch converts various users of change_page_attr() to the new,
more intent driven set_page_*/set_memory_* API set.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 13 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 016c8ccd1d8d..7c9bb3076b8a 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -770,34 +770,30 @@ void mark_rodata_ro(void)
         if (num_possible_cpus() <= 1)
 #endif
         {
-                change_page_attr(virt_to_page(start),
-                                 size >> PAGE_SHIFT, PAGE_KERNEL_RX);
+                set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
                 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);
-                change_page_attr(virt_to_page(start), size>>PAGE_SHIFT,
-                                 PAGE_KERNEL_EXEC);
+                set_pages_rw(virt_to_page(start), size>>PAGE_SHIFT);
                 global_flush_tlb();
 
                 printk("Testing CPA: write protecting again\n");
-                change_page_attr(virt_to_page(start), size>>PAGE_SHIFT,
-                                PAGE_KERNEL_RX);
+                set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT);
                 global_flush_tlb();
 #endif
         }
 #endif
         start += size;
         size = (unsigned long)__end_rodata - start;
-        change_page_attr(virt_to_page(start),
-                         size >> PAGE_SHIFT, PAGE_KERNEL_RO);
+        set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
         printk("Write protecting the kernel read-only data: %luk\n",
                size >> 10);
 
         /*
-         * change_page_attr() requires a global_flush_tlb() call after it.
+         * 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.
@@ -806,13 +802,11 @@ void mark_rodata_ro(void)
 
 #ifdef CONFIG_CPA_DEBUG
         printk("Testing CPA: undo %lx-%lx\n", start, start + size);
-        change_page_attr(virt_to_page(start), size >> PAGE_SHIFT,
-                                PAGE_KERNEL);
+        set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT);
         global_flush_tlb();
 
         printk("Testing CPA: write protecting again\n");
-        change_page_attr(virt_to_page(start), size >> PAGE_SHIFT,
-                                PAGE_KERNEL_RO);
+        set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
         global_flush_tlb();
 #endif
 }