Merge commit 'upstream/master'

2 files changed, 3 insertions, 42 deletions

diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 3f90a87527bb..fa92ff6d95f7 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -38,45 +38,6 @@ EXPORT_SYMBOL(empty_zero_page);
  */
 unsigned long mmu_context_cache = NO_CONTEXT;
 
-void show_mem(void)
-{
-        int total = 0, reserved = 0, cached = 0;
-        int slab = 0, free = 0, shared = 0;
-        pg_data_t *pgdat;
-
-        printk("Mem-info:\n");
-        show_free_areas();
-
-        for_each_online_pgdat(pgdat) {
-                struct page *page, *end;
-
-                page = pgdat->node_mem_map;
-                end = page + pgdat->node_spanned_pages;
-
-                do {
-                        total++;
-                        if (PageReserved(page))
-                                reserved++;
-                        else if (PageSwapCache(page))
-                                cached++;
-                        else if (PageSlab(page))
-                                slab++;
-                        else if (!page_count(page))
-                                free++;
-                        else
-                                shared += page_count(page) - 1;
-                        page++;
-                } while (page < end);
-        }
-
-        printk ("%d pages of RAM\n", total);
-        printk ("%d free pages\n", free);
-        printk ("%d reserved pages\n", reserved);
-        printk ("%d slab pages\n", slab);
-        printk ("%d pages shared\n", shared);
-        printk ("%d pages swap cached\n", cached);
-}
-
 /*
  * paging_init() sets up the page tables
  *
@@ -119,8 +80,7 @@ void __init paging_init(void)
                 unsigned long zones_size[MAX_NR_ZONES];
                 unsigned long low, start_pfn;
 
-                start_pfn = pgdat->bdata->node_boot_start;
-                start_pfn >>= PAGE_SHIFT;
+                start_pfn = pgdat->bdata->node_min_pfn;
                 low = pgdat->bdata->node_low_pfn;
 
                 memset(zones_size, 0, sizeof(zones_size));
@@ -129,7 +89,7 @@ void __init paging_init(void)
                 printk("Node %u: start_pfn = 0x%lx, low = 0x%lx\n",
                        nid, start_pfn, low);
 
-                free_area_init_node(nid, pgdat, zones_size, start_pfn, NULL);
+                free_area_init_node(nid, zones_size, start_pfn, NULL);
 
                 printk("Node %u: mem_map starts at %p\n",
                        pgdat->node_id, pgdat->node_mem_map);
diff --git a/arch/avr32/mm/ioremap.c b/arch/avr32/mm/ioremap.c
index 3437c82434ac..f03b79f0e0ab 100644
--- a/arch/avr32/mm/ioremap.c
+++ b/arch/avr32/mm/ioremap.c
@@ -6,6 +6,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/vmalloc.h>
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/io.h>