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>

2 files changed, 5 insertions, 6 deletions

diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index 57b57778bf60..a70fe77354b8 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -396,10 +396,10 @@ static void __init runtime_code_page_mkexec(void)
                 md = p;
                 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT);
                 if (md->type == EFI_RUNTIME_SERVICES_CODE &&
-                    (end >> PAGE_SHIFT) <= max_pfn_mapped)
-                        change_page_attr_addr(md->virt_addr,
-                                              md->num_pages,
-                                              PAGE_KERNEL_EXEC_NOCACHE);
+                    (end >> PAGE_SHIFT) <= max_pfn_mapped) {
+                        set_memory_x(md->virt_addr, md->num_pages);
+                        set_memory_uc(md->virt_addr, md->num_pages);
+                }
         }
         __flush_tlb_all();
 }
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index 04ca5c5221d7..8860c6eba8ab 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -570,8 +570,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
         gatt = (void *)__get_free_pages(GFP_KERNEL, get_order(gatt_size));
         if (!gatt)
                 panic("Cannot allocate GATT table");
-        if (change_page_attr_addr((unsigned long)gatt, gatt_size >> PAGE_SHIFT,
-                                  PAGE_KERNEL_NOCACHE))
+        if (set_memory_uc((unsigned long)gatt, gatt_size >> PAGE_SHIFT))
                 panic("Could not set GART PTEs to uncacheable pages");
         global_flush_tlb();