4 files changed, 17 insertions, 28 deletions

diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index 4cbf6d91571f..51f9bed455fa 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -83,9 +83,8 @@ int show_interrupts(struct seq_file *p, void *v)
 
         if (i == 0) {
                 seq_printf(p, "           ");
-                for (j=0; j<NR_CPUS; j++)
-                        if (cpu_online(j))
-                                seq_printf(p, "CPU%d       ",j);
+                for_each_online_cpu(j)
+                        seq_printf(p, "CPU%d       ",j);
                 seq_putc(p, '\n');
         }
 
@@ -98,9 +97,8 @@ int show_interrupts(struct seq_file *p, void *v)
 #ifndef CONFIG_SMP
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #else
-                for (j = 0; j < NR_CPUS; j++)
-                        if (cpu_online(j))
-                                seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
 #endif
                 seq_printf(p, " %14s", irq_desc[i].handler->typename);
                 seq_printf(p, "  %s", action->name);
@@ -113,9 +111,8 @@ skip:
                 spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
                 seq_printf(p, "NMI: ");
-                for (j = 0; j < NR_CPUS; j++)
-                        if (cpu_online(j))
-                                seq_printf(p, "%10u ", nmi_count(j));
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", nmi_count(j));
                 seq_putc(p, '\n');
                 seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
         }
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 5a91d6c9e66d..e1be4235f367 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 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);
         }
diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c
index 94fdfe474ac1..2a580efb58ec 100644
--- a/arch/xtensa/platform-iss/console.c
+++ b/arch/xtensa/platform-iss/console.c
@@ -31,10 +31,6 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 
-#ifdef SERIAL_INLINE
-#define _INLINE_ inline
-#endif
-
 #define SERIAL_MAX_NUM_LINES 1
 #define SERIAL_TIMER_VALUE (20 * HZ)