From 2e6155904974d017dfaab68012588f8383836ee7 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Tue, 4 Nov 2008 00:48:42 -0500
Subject: [PATCH] --- yaml --- r: 137439 b: refs/heads/master c:
 3f973e22160257c5bda85815be5b1540d391a671 h: refs/heads/master i:   137437:
 5cbdb5fd4bd137c458ae02aaf11304da09901c6b   137435:
 91ddf71a74bafd6b78a62bc3acd28ef082b41215   137431:
 5a88c9e4de33f9018fce27de125987f931b6337e   137423:
 ac3fdbafba48567b90731cbe9350142dce852b6a   137407:
 5e0c9adf3a5a3b03cc814a2d4df2b370935f7b8d v: v3

---
 [refs]                  | 2 +-
 trunk/arch/arm/mm/mmu.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 446502ddf597..4f9497a97d9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3902a15e784e9b1efa8e6ad246489c609e0ef880
+refs/heads/master: 3f973e22160257c5bda85815be5b1540d391a671
diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/arch/arm/mm/mmu.c
index 4810a4c9ffce..cf504885a5fb 100644
--- a/trunk/arch/arm/mm/mmu.c
+++ b/trunk/arch/arm/mm/mmu.c
@@ -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));