1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 6f02b9a53848..7a1065958ba9 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -8,7 +8,7 @@
 #ifdef __KERNEL__
-#include <asm/page_types.h>
+#include <asm/pgtable_types.h>
 /* Physical address where kernel should be loaded. */
 #define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
@@ -19,7 +19,7 @@
 #ifdef CONFIG_X86_64
 #define MIN_KERNEL_ALIGN_LG2    PMD_SHIFT
 #else
-#define MIN_KERNEL_ALIGN_LG2    (PAGE_SHIFT+1)
+#define MIN_KERNEL_ALIGN_LG2    (PAGE_SHIFT + THREAD_ORDER)
 #endif
 #define MIN_KERNEL_ALIGN        (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)

diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h index 6f02b9a53848..7a1065958ba9 100644 --- a/arch/x86/include/asm/boot.h +++ b/arch/x86/include/asm/boot.h
@@ -8,7 +8,7 @@
8		8
9	#ifdef __KERNEL__	9	#ifdef __KERNEL__
10		10
11	#include <asm/page_types.h>	11	#include <asm/pgtable_types.h>
12		12
13	/* Physical address where kernel should be loaded. */	13	/* Physical address where kernel should be loaded. */
14	#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \	14	#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
@@ -19,7 +19,7 @@
19	#ifdef CONFIG_X86_64	19	#ifdef CONFIG_X86_64
20	#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT	20	#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
21	#else	21	#else
22	#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT+1)	22	#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_ORDER)
23	#endif	23	#endif
24	#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)	24	#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)
25		25