Merge branch 'highmem' into devel

Conflicts:

	arch/arm/mach-clps7500/include/mach/memory.h

1 files changed, 66 insertions, 48 deletions

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index f24803c1fb0b..c0b9a78d7b87 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -646,61 +646,79 @@ static void __init early_vmalloc(char **arg)
                         "vmalloc area too small, limiting to %luMB\n",
                         vmalloc_reserve >> 20);
         }
+
+        if (vmalloc_reserve > VMALLOC_END - (PAGE_OFFSET + SZ_32M)) {
+                vmalloc_reserve = VMALLOC_END - (PAGE_OFFSET + SZ_32M);
+                printk(KERN_WARNING
+                        "vmalloc area is too big, limiting to %luMB\n",
+                        vmalloc_reserve >> 20);
+        }
 }
 __early_param("vmalloc=", early_vmalloc);
 
 #define VMALLOC_MIN     (void *)(VMALLOC_END - vmalloc_reserve)
 
-static int __init check_membank_valid(struct membank *mb)
+static void __init sanity_check_meminfo(void)
 {
-        /*
-         * Check whether this memory region has non-zero size or
-         * invalid node number.
-         */
-        if (mb->size == 0 || mb->node >= MAX_NUMNODES)
-                return 0;
-
-        /*
-         * Check whether this memory region would entirely overlap
-         * the vmalloc area.
-         */
-        if (phys_to_virt(mb->start) >= VMALLOC_MIN) {
-                printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx "
-                        "(vmalloc region overlap).\n",
-                        mb->start, mb->start + mb->size - 1);
-                return 0;
-        }
-
-        /*
-         * Check whether this memory region would partially overlap
-         * the vmalloc area.
-         */
-        if (phys_to_virt(mb->start + mb->size) < phys_to_virt(mb->start) ||
-            phys_to_virt(mb->start + mb->size) > VMALLOC_MIN) {
-                unsigned long newsize = VMALLOC_MIN - phys_to_virt(mb->start);
-
-                printk(KERN_NOTICE "Truncating RAM at %.8lx-%.8lx "
-                        "to -%.8lx (vmalloc region overlap).\n",
-                        mb->start, mb->start + mb->size - 1,
-                        mb->start + newsize - 1);
-                mb->size = newsize;
-        }
+        int i, j;
 
-        return 1;
-}
+        for (i = 0, j = 0; i < meminfo.nr_banks; i++) {
+                struct membank *bank = &meminfo.bank[j];
+                *bank = meminfo.bank[i];
 
-static void __init sanity_check_meminfo(struct meminfo *mi)
-{
-        int i, j;
+#ifdef CONFIG_HIGHMEM
+                /*
+                 * Split those memory banks which are partially overlapping
+                 * the vmalloc area greatly simplifying things later.
+                 */
+                if (__va(bank->start) < VMALLOC_MIN &&
+                    bank->size > VMALLOC_MIN - __va(bank->start)) {
+                        if (meminfo.nr_banks >= NR_BANKS) {
+                                printk(KERN_CRIT "NR_BANKS too low, "
+                                                 "ignoring high memory\n");
+                        } else {
+                                memmove(bank + 1, bank,
+                                        (meminfo.nr_banks - i) * sizeof(*bank));
+                                meminfo.nr_banks++;
+                                i++;
+                                bank[1].size -= VMALLOC_MIN - __va(bank->start);
+                                bank[1].start = __pa(VMALLOC_MIN - 1) + 1;
+                                j++;
+                        }
+                        bank->size = VMALLOC_MIN - __va(bank->start);
+                }
+#else
+                /*
+                 * Check whether this memory bank would entirely overlap
+                 * the vmalloc area.
+                 */
+                if (__va(bank->start) >= VMALLOC_MIN) {
+                        printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx "
+                               "(vmalloc region overlap).\n",
+                               bank->start, bank->start + bank->size - 1);
+                        continue;
+                }
 
-        for (i = 0, j = 0; i < mi->nr_banks; i++) {
-                if (check_membank_valid(&mi->bank[i]))
-                        mi->bank[j++] = mi->bank[i];
+                /*
+                 * Check whether this memory bank would partially overlap
+                 * the vmalloc area.
+                 */
+                if (__va(bank->start + bank->size) > VMALLOC_MIN ||
+                    __va(bank->start + bank->size) < __va(bank->start)) {
+                        unsigned long newsize = VMALLOC_MIN - __va(bank->start);
+                        printk(KERN_NOTICE "Truncating RAM at %.8lx-%.8lx "
+                               "to -%.8lx (vmalloc region overlap).\n",
+                               bank->start, bank->start + bank->size - 1,
+                               bank->start + newsize - 1);
+                        bank->size = newsize;
+                }
+#endif
+                j++;
         }
-        mi->nr_banks = j;
+        meminfo.nr_banks = j;
 }
 
-static inline void prepare_page_table(struct meminfo *mi)
+static inline void prepare_page_table(void)
 {
         unsigned long addr;
 
@@ -721,7 +739,7 @@ static inline void prepare_page_table(struct meminfo *mi)
          * Clear out all the kernel space mappings, except for the first
          * memory bank, up to the end of the vmalloc region.
          */
-        for (addr = __phys_to_virt(mi->bank[0].start + mi->bank[0].size);
+        for (addr = __phys_to_virt(bank_phys_end(&meminfo.bank[0]));
              addr < VMALLOC_END; addr += PGDIR_SIZE)
                 pmd_clear(pmd_off_k(addr));
 }
@@ -880,14 +898,14 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
  * paging_init() sets up the page tables, initialises the zone memory
  * maps, and sets up the zero page, bad page and bad page tables.
  */
-void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc)
+void __init paging_init(struct machine_desc *mdesc)
 {
         void *zero_page;
 
         build_mem_type_table();
-        sanity_check_meminfo(mi);
-        prepare_page_table(mi);
-        bootmem_init(mi);
+        sanity_check_meminfo();
+        prepare_page_table();
+        bootmem_init();
         devicemaps_init(mdesc);
 
         top_pmd = pmd_off_k(0xffff0000);