The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d9976e424909d44585206e90154f74723b5f9fe5
Gitweb: https://git.kernel.org/tip/d9976e424909d44585206e90154f74723b5f9fe5
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Fri, 22 Nov 2019 22:54:37 +01:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Fri, 22 Nov 2019 22:55:10 +01:00
x86/entry/32: Increase the size of CPU_ENTRY_AREA_PAGES
The following commit:
880a98c33996: ("x86/cpu_entry_area: Add guard page for entry stack on 32bit")
Increased the size of 'struct cpu_entry_area' by 4K, so increase
CPU_ENTRY_AREA_PAGES from 40 to 41.
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/include/asm/pgtable_32_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
index b0bc0ff..0fab4bf 100644
--- a/arch/x86/include/asm/pgtable_32_types.h
+++ b/arch/x86/include/asm/pgtable_32_types.h
@@ -44,7 +44,7 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
* Define this here and validate with BUILD_BUG_ON() in pgtable_32.c
* to avoid include recursion hell
*/
-#define CPU_ENTRY_AREA_PAGES (NR_CPUS * 40)
+#define CPU_ENTRY_AREA_PAGES (NR_CPUS * 41)
#define CPU_ENTRY_AREA_BASE \
((FIXADDR_TOT_START - PAGE_SIZE * (CPU_ENTRY_AREA_PAGES + 1)) \
|