diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2006-12-08 02:41:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:29:09 -0800 |
| commit | 3b1bdf4e08d6a8d4fae5a30224ed2c55bf1e43fc (patch) | |
| tree | e1dc5845c234f13da786711a66383b6bd7b5b14f /arch | |
| parent | c642f9e03b3ca04fc806ba5d8d34cc821382e525 (diff) | |
| download | linux-stable-3b1bdf4e08d6a8d4fae5a30224ed2c55bf1e43fc.tar.gz linux-stable-3b1bdf4e08d6a8d4fae5a30224ed2c55bf1e43fc.tar.bz2 linux-stable-3b1bdf4e08d6a8d4fae5a30224ed2c55bf1e43fc.zip | |
[PATCH] CPU hotplug broken with 2GB VMSPLIT
In VMSPLIT mode, kernel PGD might have more entries than user space.
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.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 4bf0e3c83b8b..1e00b03163b9 100644 --- a/arch/i386/kernel/smpboot.c +++ b/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); |