Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6.git] / arch / m32r / mm / discontig.c

diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c
index cbc3c4c..5d2858f 100644 (file)
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
@@ -32,6 +32,9 @@ typedef struct {
 } mem_prof_t;
 static mem_prof_t mem_prof[MAX_NUMNODES];
 
+extern unsigned long memory_start;
+extern unsigned long memory_end;
+
 static void __init mem_prof_init(void)
 {
        unsigned long start_pfn, holes, free_pfn;
@@ -42,7 +45,7 @@ static void __init mem_prof_init(void)
        /* Node#0 SDRAM */
        mp = &mem_prof[0];
        mp->start_pfn = PFN_UP(CONFIG_MEMORY_START);
-       mp->pages = PFN_DOWN(CONFIG_MEMORY_SIZE);
+       mp->pages = PFN_DOWN(memory_end - memory_start);
        mp->holes = 0;
        mp->free_pfn = PFN_UP(__pa(_end));
 
@@ -111,9 +114,9 @@ unsigned long __init setup_memory(void)
                                initrd_start, INITRD_SIZE);
                } else {
                        printk("initrd extends beyond end of memory "
-                               "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
+                               "(0x%08lx > 0x%08llx)\ndisabling initrd\n",
                                INITRD_START + INITRD_SIZE,
-                               PFN_PHYS(max_low_pfn));
+                               (unsigned long long)PFN_PHYS(max_low_pfn));
 
                        initrd_start = 0;
                }
@@ -154,9 +157,9 @@ unsigned long __init zone_sizes_init(void)
         *  Use all area of internal RAM.
         *  see __alloc_pages()
         */
-       NODE_DATA(1)->node_zones->pages_min = 0;
-       NODE_DATA(1)->node_zones->pages_low = 0;
-       NODE_DATA(1)->node_zones->pages_high = 0;
+       NODE_DATA(1)->node_zones->watermark[WMARK_MIN] = 0;
+       NODE_DATA(1)->node_zones->watermark[WMARK_LOW] = 0;
+       NODE_DATA(1)->node_zones->watermark[WMARK_HIGH] = 0;
 
        return holes;
 }