From cb1e32c51d924eca2b2ee261bc8b33a8ce0b486f Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Fri, 8 Dec 2006 02:41:13 -0800
Subject: [PATCH] --- yaml --- r: 43847 b: refs/heads/master c:
 3b1bdf4e08d6a8d4fae5a30224ed2c55bf1e43fc h: refs/heads/master i:   43845:
 91c7abae1a15d6d0a6bf2aa30034af8e674b98c9   43843:
 c01f3dd1a75646798716fa292f3cb2ca8dfb07a0   43839:
 42b5abd41203beb2a36e7607770b45c41b680d0c v: v3

---
 [refs]                           | 2 +-
 trunk/arch/i386/kernel/smpboot.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8d91cf29062..8e37fd7a0a80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c642f9e03b3ca04fc806ba5d8d34cc821382e525
+refs/heads/master: 3b1bdf4e08d6a8d4fae5a30224ed2c55bf1e43fc
diff --git a/trunk/arch/i386/kernel/smpboot.c b/trunk/arch/i386/kernel/smpboot.c
index 4bf0e3c83b8b..1e00b03163b9 100644
--- a/trunk/arch/i386/kernel/smpboot.c
+++ b/trunk/arch/i386/kernel/smpboot.c
@@ -1118,7 +1118,7 @@ static int __cpuinit __smp_prepare_cpu(int cpu)
 
 	/* init low mem mapping */
 	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
-			KERNEL_PGD_PTRS);
+			min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
 	flush_tlb_all();
 	schedule_work(&info.task);
 	wait_for_completion(&done);