[ARM] ignore high memory with VIPT aliasing caches
authorNicolas Pitre <nico@cam.org>
Tue, 4 Nov 2008 05:48:42 +0000 (00:48 -0500)
committerNicolas Pitre <nico@cam.org>
Mon, 16 Mar 2009 01:01:22 +0000 (21:01 -0400)
VIPT aliasing caches have issues of their own which are not yet handled.
Usage of discard_old_kernel_data() in copypage-v6.c is not highmem ready,
kmap/fixmap stuff doesn't take account of cache colouring, etc.
If/when those issues are handled then this could be reverted.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
arch/arm/mm/mmu.c

index 4810a4c9ffce1ace6f0872949514ad3844d1c76c..cf504885a5fb6f1450e4483cc2a542fdced5fc25 100644 (file)
@@ -18,6 +18,7 @@
 #include <asm/cputype.h>
 #include <asm/mach-types.h>
 #include <asm/sections.h>
+#include <asm/cachetype.h>
 #include <asm/setup.h>
 #include <asm/sizes.h>
 #include <asm/tlb.h>
@@ -678,6 +679,10 @@ static void __init sanity_check_meminfo(void)
                        if (meminfo.nr_banks >= NR_BANKS) {
                                printk(KERN_CRIT "NR_BANKS too low, "
                                                 "ignoring high memory\n");
+                       } else if (cache_is_vipt_aliasing()) {
+                               printk(KERN_CRIT "HIGHMEM is not yet supported "
+                                                "with VIPT aliasing cache, "
+                                                "ignoring high memory\n");
                        } else {
                                memmove(bank + 1, bank,
                                        (meminfo.nr_banks - i) * sizeof(*bank));