[PATCH 2/3] x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Joerg Roedel
Date: Thursday, November 11, 2010 - 8:16 am

From: Hugh Dickins <hughd@google.com>

commit b7d460897739e02f186425b7276e3fdb1595cea7 upstream

rc2 kernel crashes when booting second cpu on this CONFIG_VMSPLIT_2G_OPT
laptop: whereas cloning from kernel to low mappings pgd range does need
to limit by both KERNEL_PGD_PTRS and KERNEL_PGD_BOUNDARY, cloning kernel
pgd range itself must not be limited by the smaller KERNEL_PGD_BOUNDARY.

Signed-off-by: Hugh Dickins <hughd@google.com>
LKML-Reference: <alpine.LSU.2.00.1008242235120.2515@sister.anvils>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 arch/x86/kernel/trampoline.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/trampoline.c b/arch/x86/kernel/trampoline.c
index 4e816a4..0ac23a7 100644
--- a/arch/x86/kernel/trampoline.c
+++ b/arch/x86/kernel/trampoline.c
@@ -47,8 +47,7 @@ void __init setup_trampoline_page_table(void)
 	/* Copy kernel address range */
 	clone_pgd_range(trampoline_pg_dir + KERNEL_PGD_BOUNDARY,
 			swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-			min_t(unsigned long, KERNEL_PGD_PTRS,
-			      KERNEL_PGD_BOUNDARY));
+			KERNEL_PGD_PTRS);
 
 	/* Initialize low mappings */
 	clone_pgd_range(trampoline_pg_dir,
-- 
1.7.0.4


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Erratum 383 fix for 32 bit x86 kernels, Joerg Roedel, (Fri Sep 24, 4:52 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Greg KH, (Fri Sep 24, 6:47 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Roedel, Joerg, (Fri Sep 24, 6:53 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Greg KH, (Fri Sep 24, 9:02 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Borislav Petkov, (Fri Sep 24, 9:24 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Greg KH, (Fri Sep 24, 9:29 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Greg KH, (Fri Oct 22, 9:18 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Greg KH, (Fri Oct 22, 9:20 am)
Re: Erratum 383 fix for 32 bit x86 kernels, Borislav Petkov, (Sat Oct 23, 1:26 am)
[PATCH 0/3] Erratum 383 fix for 32 bit x86 kernels, Joerg Roedel, (Thu Nov 11, 6:56 am)
[PATCH 0/3] Erratum 383 fix for 32 bit x86 kernels, Joerg Roedel, (Thu Nov 11, 8:16 am)
[PATCH 2/3] x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT tram ..., Joerg Roedel, (Thu Nov 11, 8:16 am)
Re: [PATCH 1/3] x86-32: Separate 1:1 pagetables from swapp ..., Jeremy Fitzhardinge, (Tue Dec 7, 8:06 pm)
Re: [PATCH 1/3] x86-32: Separate 1:1 pagetables from swapp ..., Jeremy Fitzhardinge, (Wed Dec 8, 8:21 am)