4 files changed, 18 insertions, 15 deletions

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7ee4a14..e90ef5d 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -26,6 +26,10 @@ config GENERIC_HARDIRQS
 	bool
 	default y
 
+config RWSEM_GENERIC_SPINLOCK
+       bool
+       default y
+
 source "init/Kconfig"
 
 menu "Processor type and features"
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index f1f5966..64a649e 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -64,6 +64,9 @@ EXPORT_SYMBOL(init_task);
 
 struct task_struct *current_set[NR_CPUS] = {&init_task, };
 
+void (*pm_power_off)(void) = NULL;
+EXPORT_SYMBOL(pm_power_off);
+
 
 #if XCHAL_CP_NUM > 0
 
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 5a91d6c..e1be423 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -272,7 +272,7 @@ free_reserved_mem(void *start, void *end)
 {
 	for (; start < end; start += PAGE_SIZE) {
 		ClearPageReserved(virt_to_page(start));
-		set_page_count(virt_to_page(start), 1);
+		init_page_count(virt_to_page(start));
 		free_page((unsigned long)start);
 		totalram_pages++;
 	}
diff --git a/arch/xtensa/mm/pgtable.c b/arch/xtensa/mm/pgtable.c
index e5e119c..7d28914 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);
 	}