summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2009-08-21 04:34:45 -0400
committerIngo Molnar <mingo@elte.hu>2009-08-21 16:40:31 +0200
commit3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7 (patch)
treefaa3358dc3a2132e322f2728ed5858f4bf05abcf /arch
parent8126dec32738421afa362114337331337b4be17f (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/init_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 6176fe8f29e..ea56b8cbb6a 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -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) {