Commit 3e0e1e9c authored Aug 21, 2009 by Amerigo Wang Committed by Ingo Molnar Aug 21, 2009

x86: Fix an incorrect argument of reserve_bootmem()

This line looks suspicious, because if this is true, then the
'flags' parameter of function reserve_bootmem_generic() will be
unused when !CONFIG_NUMA. I don't think this is what we want.

Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: akpm@linux-foundation.org
LKML-Reference: <20090821083709.5098.52505.sendpatchset@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 8126dec3

arch/x86/mm/init_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -796,7 +796,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
		return ret;

		#else
		reserve_bootmem(phys, len, BOOTMEM_DEFAULT);
		reserve_bootmem(phys, len, flags);
		#endif

		if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) {