From beed272285adea77389e9eff376d88b3ca9059e7 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 12 Mar 2009 16:04:42 -0700
Subject: [PATCH] --- yaml --- r: 138770 b: refs/heads/master c:
 7543c1de84ed93c6769c9f20dced08a522af8912 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/x86/include/asm/page_32_types.h | 5 +++++
 trunk/arch/x86/kernel/head_32.S            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9ef2fdad5cc0..9fc13e6f249e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de6cb442e76bbaf2e685150be8ddac0f237a59c
+refs/heads/master: 7543c1de84ed93c6769c9f20dced08a522af8912
diff --git a/trunk/arch/x86/include/asm/page_32_types.h b/trunk/arch/x86/include/asm/page_32_types.h
index f1e4a79a6e41..0f915ae649a7 100644
--- a/trunk/arch/x86/include/asm/page_32_types.h
+++ b/trunk/arch/x86/include/asm/page_32_types.h
@@ -39,6 +39,11 @@
 #define __VIRTUAL_MASK_SHIFT	32
 #endif	/* CONFIG_X86_PAE */
 
+/*
+ * Kernel image size is limited to 512 MB (see in arch/x86/kernel/head_32.S)
+ */
+#define KERNEL_IMAGE_SIZE	(512 * 1024 * 1024)
+
 #ifndef __ASSEMBLY__
 
 /*
diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S
index db6652710e98..3ce5456dfbe6 100644
--- a/trunk/arch/x86/kernel/head_32.S
+++ b/trunk/arch/x86/kernel/head_32.S
@@ -54,7 +54,7 @@
  *
  * This should be a multiple of a page.
  */
-LOW_PAGES = 1<<(32-PAGE_SHIFT_asm)
+LOW_PAGES = (KERNEL_IMAGE_SIZE + PAGE_SIZE_asm - 1)>>PAGE_SHIFT
 
 /*
  * To preserve the DMA pool in PAGEALLOC kernels, we'll allocate