X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fxtensa%2Fmm%2Fpgtable.c;fp=arch%2Fxtensa%2Fmm%2Fpgtable.c;h=e5e119c820e4713d5badfd650c0a9792aca99e72;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=7d28914d11cbc63afcf131c7ee030288803441d9;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

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