summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2007-01-23 16:52:07 +0100
committerAdrian Bunk <bunk@stusta.de>2007-01-23 16:52:07 +0100
commit32b7d973f1bfaf221ad53957fd360187815d29c2 (patch)
treeea903a008e21a4d1ded0998ff75544027add93ee
parentfaa309e7b921b2104a42d4ac0e0122f3399a3789 (diff)
i386: fix CPU hotplug with 2GB VMSPLIT
In VMSPLIT mode, kernel PGD might have more entries than user space Signed-off-by: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--arch/i386/kernel/smpboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 7007e1783797..f04ff35437fb 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1054,7 +1054,7 @@ int __devinit 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(&task);
wait_for_completion(&done);