diff --git a/[refs] b/[refs] index 9a30d8e6d14b..d7c658ac387f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 383bc5cecc2ed0b8f44a25488660b03030425ef7 +refs/heads/master: b9d19f4a51447930db002409945ad40a7a373cb0 diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c index 4b953dc93883..392812d3c63c 100644 --- a/trunk/arch/x86/kernel/setup_32.c +++ b/trunk/arch/x86/kernel/setup_32.c @@ -427,7 +427,7 @@ void __init setup_arch(char **cmdline_p) find_low_pfn_range(); /* max_pfn_mapped is updated here */ - init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT)); + max_pfn_mapped = init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT)); reserve_initrd();