diff options
author | Yinghai Lu <yinghai@kernel.org> | 2014-01-27 17:06:50 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 21:02:38 -0800 |
commit | 4ce7a8697cb795fda6bdf082c14743b4bcd551c3 (patch) | |
tree | 04c7c47717530b28602c7243d7efe28277c7908a /mm/memblock.c | |
parent | ad6492b80f60a2139fa9bf8fd79b182fe5e3647c (diff) | |
download | linux-stable-4ce7a8697cb795fda6bdf082c14743b4bcd551c3.tar.gz linux-stable-4ce7a8697cb795fda6bdf082c14743b4bcd551c3.tar.bz2 linux-stable-4ce7a8697cb795fda6bdf082c14743b4bcd551c3.zip |
x86: revert wrong memblock current limit setting
Dave reported big numa system booting is broken.
It turns out that commit 5b6e529521d3 ("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 5b6e529521d3 to fix a no-boot regression which was triggered by
457ff1de2d24 ("lib/swiotlb.c: use memblock apis for early memory
allocations").
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Reported-by: Dave Hansen <dave.hansen@intel.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memblock.c')
0 files changed, 0 insertions, 0 deletions