-stable review patch. If anyone has any objections, please let us know. ------------------ From: Shaohua Li In VMSPLIT mode, kernel PGD might have more entries than user space Signed-off-by: Shaohua Li Signed-off-by: Chris Wright --- arch/i386/kernel/smpboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.19.1.orig/arch/i386/kernel/smpboot.c +++ linux-2.6.19.1/arch/i386/kernel/smpboot.c @@ -1095,7 +1095,7 @@ static int __cpuinit __smp_prepare_cpu(i /* 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); --