diff --git a/[refs] b/[refs] index 42ae35bdb149..8804eefd22dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d49c4288407b2ffa8cab270cb5bc6882abe969f6 +refs/heads/master: 6780711e9817585f89b02b0556aac3564cbe1f45 diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c index be1a99003677..4fa9f6c4542b 100644 --- a/trunk/arch/x86/kernel/setup_32.c +++ b/trunk/arch/x86/kernel/setup_32.c @@ -749,6 +749,8 @@ void __init setup_arch(char **cmdline_p) */ max_pfn = e820_end_of_ram(); + /* preallocate 4k for mptable mpc */ + early_reserve_e820_mpc_new(); /* update e820 for memory not covered by WB MTRRs */ mtrr_bp_init(); if (mtrr_trim_uncached_memory(max_pfn)) {