[Patch] x86: fix a wrong argument of reserve_bootmem()

From: Amerigo Wang
Date: Fri Aug 21 2009 - 04:37:55 EST



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: Ingo Molnar <mingo@xxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>

---
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/