Commit 4ce7a869 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

x86: revert wrong memblock current limit setting

Dave reported big numa system booting is broken.

It turns out that commit 5b6e5295 ("x86: memblock: set current limit
to max low memory address") sets the limit to low wrongly.

max_low_pfn_mapped is different from max_pfn_mapped.
max_low_pfn_mapped is always under 4G.

That will memblock_alloc_nid all go under 4G.

Revert 5b6e5295 to fix a no-boot regression which was triggered by

 ("lib/swiotlb.c: use memblock apis for early memory
Signed-off-by: default avatarYinghai Lu <>
Reported-by: default avatarDave Hansen <>
Acked-by: default avatarSantosh Shilimkar <>
Cc: Russell King <>
Cc: Konrad Rzeszutek Wilk <>
Cc: Ingo Molnar <>
Cc: "H. Peter Anvin" <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent ad6492b8
......@@ -51,9 +51,9 @@ extern int devmem_is_allowed(unsigned long pagenr);
extern unsigned long max_low_pfn_mapped;
extern unsigned long max_pfn_mapped;
static inline phys_addr_t get_max_low_mapped(void)
static inline phys_addr_t get_max_mapped(void)
return (phys_addr_t)max_low_pfn_mapped << PAGE_SHIFT;
return (phys_addr_t)max_pfn_mapped << PAGE_SHIFT;
bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn);
......@@ -1119,7 +1119,7 @@ void __init setup_arch(char **cmdline_p)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment