[PATCH] on x86 NUMA is implied on DISCONTIGMEM

From: Christoph Egger
Date: Wed May 19 2010 - 07:11:30 EST


There's a specialization on whether NUMA is selected inside a ifdef
CONFIG_DISCONTIGMEM block in arch/x86/include/asm/mmzone_32.h, however
the Kconfig model for x86 only alows DISCONTIGMEM when NUMA is set so
the !NUMA block is effectively unreachable.

Signed-off-by: Christoph Egger <siccegge@xxxxxxxxx>
---
arch/x86/include/asm/mmzone_32.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
index 91df7c5..993ed50 100644
--- a/arch/x86/include/asm/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
@@ -61,11 +61,7 @@ extern s8 physnode_map[];

static inline int pfn_to_nid(unsigned long pfn)
{
-#ifdef CONFIG_NUMA
return((int) physnode_map[(pfn) / PAGES_PER_ELEMENT]);
-#else
- return 0;
-#endif
}

/*
--
1.6.3.3






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