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-24 20:22:55 +0200
commita6a06f7b577f89d0b916c5ccaff67ca5ed444a78 (patch)
tree437fb9b0b481af3f82e98f522b43b6b5dcda6f40 /arch
parentfc0ce23506d943b9eaa731a051769d0e0605eb03 (diff)
downloadlinux-a6a06f7b577f89d0b916c5ccaff67ca5ed444a78.tar.gz
linux-a6a06f7b577f89d0b916c5ccaff67ca5ed444a78.tar.bz2
linux-a6a06f7b577f89d0b916c5ccaff67ca5ed444a78.zip
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 6176fe8f29e0..ea56b8cbb6a6 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) {