x86-64: fix overlap of modules and fixmap areas
PATCH 1/1 x86-64: fix overlap of modules and fixmap areas
Plus add a build time check so this doesn't go unnoticed again.
Signed-off-by Jan Beulich <[email protected]>
--- arch/x86/kernel/head64.c | 1 + include/asm-x86/pgtable_64.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/head64.c +1 -0
@@ -88,6 +88,7 @@ void __init x86_64_start_kernel(char * rBUILD_BUG_ON (!(MODULES_VADDR > __START_KERNEL));BUILD_BUG_ON (!(((MODULES_END -1 ) &PGDIR_MASK ) == (__START_KERNEL &PGDIR_MASK ))); +BUILD_BUG_ON (__fix_to_virt (__end_of_fixed_addresses) <=MODULES_END );/* clear bss before set_intr_gate with early_idt_handler */ clear_bss ();
include/asm-x86/pgtable_64.h +1 -1
@@ -151,7 +151,7 @@ static inline void native_pgd_clear(pgd_#define VMALLOC_END _AC(0xffffe1ffffffffff, UL)#define VMEMMAP_START _AC(0xffffe20000000000, UL)#define MODULES_VADDR _AC(0xffffffffa0000000, UL) -#define MODULES_END _AC(0xfffffffffff00000, UL) +#define MODULES_END _AC(0xffffffffff000000, UL)#define MODULES_LEN (MODULES_END - MODULES_VADDR)#ifndef __ASSEMBLY__
Ingo Molnar
AppliedQuoted 3 lines · Jan Beulich
Plus add a build time check so this doesn't go unnoticed again.
Signed-off-by Jan Beulich <[email protected]>
applied to tip/x86/urgent - thanks Jan!
Ingo