diff options
author | Nicolas Pitre <nico@cam.org> | 2008-11-04 00:48:42 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:01:22 -0400 |
commit | 3f973e22160257c5bda85815be5b1540d391a671 (patch) | |
tree | c453cc200f3cd71bd28195e9959034aa673a7693 /arch/arm | |
parent | 3902a15e784e9b1efa8e6ad246489c609e0ef880 (diff) |
[ARM] ignore high memory with VIPT aliasing caches
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mm/mmu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 4810a4c9ffce..cf504885a5fb 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/cputype.h> | 18 | #include <asm/cputype.h> |
19 | #include <asm/mach-types.h> | 19 | #include <asm/mach-types.h> |
20 | #include <asm/sections.h> | 20 | #include <asm/sections.h> |
21 | #include <asm/cachetype.h> | ||
21 | #include <asm/setup.h> | 22 | #include <asm/setup.h> |
22 | #include <asm/sizes.h> | 23 | #include <asm/sizes.h> |
23 | #include <asm/tlb.h> | 24 | #include <asm/tlb.h> |
@@ -678,6 +679,10 @@ static void __init sanity_check_meminfo(void) | |||
678 | if (meminfo.nr_banks >= NR_BANKS) { | 679 | if (meminfo.nr_banks >= NR_BANKS) { |
679 | printk(KERN_CRIT "NR_BANKS too low, " | 680 | printk(KERN_CRIT "NR_BANKS too low, " |
680 | "ignoring high memory\n"); | 681 | "ignoring high memory\n"); |
682 | } else if (cache_is_vipt_aliasing()) { | ||
683 | printk(KERN_CRIT "HIGHMEM is not yet supported " | ||
684 | "with VIPT aliasing cache, " | ||
685 | "ignoring high memory\n"); | ||
681 | } else { | 686 | } else { |
682 | memmove(bank + 1, bank, | 687 | memmove(bank + 1, bank, |
683 | (meminfo.nr_banks - i) * sizeof(*bank)); | 688 | (meminfo.nr_banks - i) * sizeof(*bank)); |