From baf402367b5ae22e05c40e10898af3666cb32af4 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Fri, 19 Sep 2008 10:43:06 -0400
Subject: [PATCH] --- yaml --- r: 123566 b: refs/heads/master c:
 9210807cb5a3f19a0e954dd401e3a2c3626d1b48 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4890b0ac8b14..e7e9f2543b1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6db015e49c03d42247d2a985475b833635406a4f
+refs/heads/master: 9210807cb5a3f19a0e954dd401e3a2c3626d1b48
diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/arch/arm/mm/mmu.c
index ab511d94d917..636cf8fc70ef 100644
--- a/trunk/arch/arm/mm/mmu.c
+++ b/trunk/arch/arm/mm/mmu.c
@@ -646,6 +646,13 @@ 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);