1 files changed, 10 insertions, 14 deletions

diff --git a/arch/xtensa/mm/pgtable.c b/arch/xtensa/mm/pgtable.c
index e5e119c820e4..7d28914d11cb 100644
--- a/arch/xtensa/mm/pgtable.c
+++ b/arch/xtensa/mm/pgtable.c
@@ -14,25 +14,21 @@
 
 pte_t* pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
-        pte_t *pte, p;
+        pte_t *pte = NULL, *p;
         int color = ADDR_COLOR(address);
         int i;
 
         p = (pte_t*) __get_free_pages(GFP_KERNEL|__GFP_REPEAT, COLOR_ORDER);
 
         if (likely(p)) {
-                struct page *page;
-
-                for (i = 0; i < COLOR_SIZE; i++, p++) {
-                        page = virt_to_page(pte);
-
-                        set_page_count(page, 1);
-                        ClearPageCompound(page);
+                split_page(virt_to_page(p), COLOR_ORDER);
 
+                for (i = 0; i < COLOR_SIZE; i++) {
                         if (ADDR_COLOR(p) == color)
                                 pte = p;
                         else
                                 free_page(p);
+                        p += PTRS_PER_PTE;
                 }
                 clear_page(pte);
         }
@@ -49,20 +45,20 @@ int flush;
 
 struct page* pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        struct page *page, p;
+        struct page *page = NULL, *p;
         int color = ADDR_COLOR(address);
 
         p = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
 
         if (likely(p)) {
-                for (i = 0; i < PAGE_ORDER; i++) {
-                        set_page_count(p, 1);
-                        ClearPageCompound(p);
+                split_page(p, COLOR_ORDER);
 
-                        if (PADDR_COLOR(page_address(pg)) == color)
+                for (i = 0; i < PAGE_ORDER; i++) {
+                        if (PADDR_COLOR(page_address(p)) == color)
                                 page = p;
                         else
-                                free_page(p);
+                                __free_page(p);
+                        p++;
                 }
                 clear_highpage(page);
         }