1 files changed, 68 insertions, 39 deletions

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e0e644ff3204..82b68c789a5f 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -18,6 +18,7 @@
 #include <asm/mmu_context.h>
 #include <asm/tlb.h>
 #include <asm/cacheflush.h>
+#include <asm/sections.h>
 #include <asm/cache.h>
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
@@ -36,14 +37,11 @@ void show_mem(void)
         show_free_areas();
 
         for_each_online_pgdat(pgdat) {
-                struct page *page, *end;
-                unsigned long flags;
+                unsigned long flags, i;
 
                 pgdat_resize_lock(pgdat, &flags);
-                page = pgdat->node_mem_map;
-                end = page + pgdat->node_spanned_pages;
-
-                do {
+                for (i = 0; i < pgdat->node_spanned_pages; i++) {
+                        struct page *page = pgdat_page_nr(pgdat, i);
                         total++;
                         if (PageReserved(page))
                                 reserved++;
@@ -55,9 +53,7 @@ void show_mem(void)
                                 free++;
                         else
                                 shared += page_count(page) - 1;
-                        page++;
-                } while (page < end);
-
+                }
                 pgdat_resize_unlock(pgdat, &flags);
         }
 
@@ -137,16 +133,12 @@ void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
 }
 #endif  /* CONFIG_MMU */
 
-/* References to section boundaries */
-
-extern char _text, _etext, _edata, __bss_start, _end;
-extern char __init_begin, __init_end;
-
 /*
  * paging_init() sets up the page tables
  */
 void __init paging_init(void)
 {
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
         int nid;
 
         /* We don't need to map the kernel through the TLB, as
@@ -158,43 +150,39 @@ void __init paging_init(void)
          * check for a null value. */
         set_TTB(swapper_pg_dir);
 
+        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
+
         for_each_online_node(nid) {
                 pg_data_t *pgdat = NODE_DATA(nid);
-                unsigned long max_zone_pfns[MAX_NR_ZONES];
                 unsigned long low, start_pfn;
 
-                memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
-
                 start_pfn = pgdat->bdata->node_boot_start >> PAGE_SHIFT;
                 low = pgdat->bdata->node_low_pfn;
 
-                max_zone_pfns[ZONE_NORMAL] = low;
-                add_active_range(nid, start_pfn, low);
+                if (max_zone_pfns[ZONE_NORMAL] < low)
+                        max_zone_pfns[ZONE_NORMAL] = low;
 
                 printk("Node %u: start_pfn = 0x%lx, low = 0x%lx\n",
                        nid, start_pfn, low);
-
-                free_area_init_nodes(max_zone_pfns);
-
-                printk("Node %u: mem_map starts at %p\n",
-                       pgdat->node_id, pgdat->node_mem_map);
         }
+
+        free_area_init_nodes(max_zone_pfns);
 }
 
 static struct kcore_list kcore_mem, kcore_vmalloc;
 
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
+        int codesize, datasize, initsize;
         int nid;
 
-        reservedpages = 0;
+        num_physpages = 0;
+        high_memory = NULL;
 
         for_each_online_node(nid) {
                 pg_data_t *pgdat = NODE_DATA(nid);
                 unsigned long node_pages = 0;
                 void *node_high_memory;
-                int i;
 
                 num_physpages += pgdat->node_present_pages;
 
@@ -203,13 +191,9 @@ void __init mem_init(void)
 
                 totalram_pages += node_pages;
 
-                for (i = 0; i < node_pages; i++)
-                        if (PageReserved(pgdat->node_mem_map + i))
-                                reservedpages++;
-
-                node_high_memory = (void *)((pgdat->node_start_pfn +
-                                             pgdat->node_spanned_pages) <<
-                                                PAGE_SHIFT);
+                node_high_memory = (void *)__va((pgdat->node_start_pfn +
+                                                 pgdat->node_spanned_pages) <<
+                                                 PAGE_SHIFT);
                 if (node_high_memory > high_memory)
                         high_memory = node_high_memory;
         }
@@ -239,11 +223,10 @@ void __init mem_init(void)
                    VMALLOC_END - VMALLOC_START);
 
         printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-               "%dk reserved, %dk data, %dk init)\n",
+               "%dk data, %dk init)\n",
                 (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-                totalram_pages << (PAGE_SHIFT-10),
+                num_physpages << (PAGE_SHIFT-10),
                 codesize >> 10,
-                reservedpages << (PAGE_SHIFT-10),
                 datasize >> 10,
                 initsize >> 10);
 
@@ -264,7 +247,9 @@ void free_initmem(void)
                 free_page(addr);
                 totalram_pages++;
         }
-        printk ("Freeing unused kernel memory: %dk freed\n", (&__init_end - &__init_begin) >> 10);
+        printk("Freeing unused kernel memory: %ldk freed\n",
+               ((unsigned long)&__init_end -
+                (unsigned long)&__init_begin) >> 10);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -277,6 +262,50 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                 free_page(p);
                 totalram_pages++;
         }
-        printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+        printk("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+}
+#endif
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+void online_page(struct page *page)
+{
+        ClearPageReserved(page);
+        init_page_count(page);
+        __free_page(page);
+        totalram_pages++;
+        num_physpages++;
 }
+
+int arch_add_memory(int nid, u64 start, u64 size)
+{
+        pg_data_t *pgdat;
+        unsigned long start_pfn = start >> PAGE_SHIFT;
+        unsigned long nr_pages = size >> PAGE_SHIFT;
+        int ret;
+
+        pgdat = NODE_DATA(nid);
+
+        /* We only have ZONE_NORMAL, so this is easy.. */
+        ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
+        if (unlikely(ret))
+                printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(arch_add_memory);
+
+int remove_memory(u64 start, u64 size)
+{
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(remove_memory);
+
+#ifdef CONFIG_NUMA
+int memory_add_physaddr_to_nid(u64 addr)
+{
+        /* Node 0 for now.. */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
+#endif
 #endif