1 files changed, 16 insertions, 12 deletions

diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
index f5d0730e7b08..ce95676abd60 100644
--- a/arch/x86/kernel/espfix_64.c
+++ b/arch/x86/kernel/espfix_64.c
@@ -131,25 +131,24 @@ void __init init_espfix_bsp(void)
         init_espfix_random();
 
         /* The rest is the same as for any other processor */
-        init_espfix_ap();
+        init_espfix_ap(0);
 }
 
-void init_espfix_ap(void)
+void init_espfix_ap(int cpu)
 {
-        unsigned int cpu, page;
+        unsigned int page;
         unsigned long addr;
         pud_t pud, *pud_p;
         pmd_t pmd, *pmd_p;
         pte_t pte, *pte_p;
-        int n;
+        int n, node;
         void *stack_page;
         pteval_t ptemask;
 
         /* We only have to do this once... */
-        if (likely(this_cpu_read(espfix_stack)))
+        if (likely(per_cpu(espfix_stack, cpu)))
                 return;         /* Already initialized */
 
-        cpu = smp_processor_id();
         addr = espfix_base_addr(cpu);
         page = cpu/ESPFIX_STACKS_PER_PAGE;
 
@@ -165,12 +164,15 @@ void init_espfix_ap(void)
         if (stack_page)
                 goto unlock_done;
 
+        node = cpu_to_node(cpu);
         ptemask = __supported_pte_mask;
 
         pud_p = &espfix_pud_page[pud_index(addr)];
         pud = *pud_p;
         if (!pud_present(pud)) {
-                pmd_p = (pmd_t *)__get_free_page(PGALLOC_GFP);
+                struct page *page = alloc_pages_node(node, PGALLOC_GFP, 0);
+
+                pmd_p = (pmd_t *)page_address(page);
                 pud = __pud(__pa(pmd_p) | (PGTABLE_PROT & ptemask));
                 paravirt_alloc_pmd(&init_mm, __pa(pmd_p) >> PAGE_SHIFT);
                 for (n = 0; n < ESPFIX_PUD_CLONES; n++)
@@ -180,7 +182,9 @@ void init_espfix_ap(void)
         pmd_p = pmd_offset(&pud, addr);
         pmd = *pmd_p;
         if (!pmd_present(pmd)) {
-                pte_p = (pte_t *)__get_free_page(PGALLOC_GFP);
+                struct page *page = alloc_pages_node(node, PGALLOC_GFP, 0);
+
+                pte_p = (pte_t *)page_address(page);
                 pmd = __pmd(__pa(pte_p) | (PGTABLE_PROT & ptemask));
                 paravirt_alloc_pte(&init_mm, __pa(pte_p) >> PAGE_SHIFT);
                 for (n = 0; n < ESPFIX_PMD_CLONES; n++)
@@ -188,7 +192,7 @@ void init_espfix_ap(void)
         }
 
         pte_p = pte_offset_kernel(&pmd, addr);
-        stack_page = (void *)__get_free_page(GFP_KERNEL);
+        stack_page = page_address(alloc_pages_node(node, GFP_KERNEL, 0));
         pte = __pte(__pa(stack_page) | (__PAGE_KERNEL_RO & ptemask));
         for (n = 0; n < ESPFIX_PTE_CLONES; n++)
                 set_pte(&pte_p[n*PTE_STRIDE], pte);
@@ -199,7 +203,7 @@ void init_espfix_ap(void)
 unlock_done:
         mutex_unlock(&espfix_init_mutex);
 done:
-        this_cpu_write(espfix_stack, addr);
-        this_cpu_write(espfix_waddr, (unsigned long)stack_page
-                       + (addr & ~PAGE_MASK));
+        per_cpu(espfix_stack, cpu) = addr;
+        per_cpu(espfix_waddr, cpu) = (unsigned long)stack_page
+                                      + (addr & ~PAGE_MASK);
 }