[tip:x86/urgent] x86: Fix an incorrect argument of reserve_bootmem()

[tip-bot for Amerigo Wang]

Commit-ID:  a6a06f7b577f89d0b916c5ccaff67ca5ed444a78
Gitweb:     http://git.kernel.org/tip/a6a06f7b577f89d0b916c5ccaff67ca5ed444a78
Author:     Amerigo Wang <amwang@xxxxxxxxxx>
AuthorDate: Fri, 21 Aug 2009 04:34:45 -0400
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Mon, 24 Aug 2009 20:22:55 +0200

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@xxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: akpm@xxxxxxxxxxxxxxxxxxxx
LKML-Reference: <20090821083709.5098.52505.sendpatchset@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
 arch/x86/mm/init_64.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 6176fe8..ea56b8c 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) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/