diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2006-12-23 21:39:08 -0500 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2007-01-10 11:05:20 -0800 |
| commit | abf56f5ea98c71722511e37d321982013123dbbf (patch) | |
| tree | ced40fdf78360f8259a5cb2aa085989f6b4bb752 /arch | |
| parent | 6e7e241df766e1a6c2d505df5e14b593a0e63bb4 (diff) | |
[PATCH] i386: CPU hotplug broken 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: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 4bb8b77cd65b..b5f562eec611 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c @@ -1095,7 +1095,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(&task); wait_for_completion(&done); |