[PATCH] x86_64 out of line numa funcs are discontig only

[PATCH] x86_64 out of line numa funcs are discontig only

[Andy Whitcroft]

Grrrr, patch sender collapsed the cc lines ...

-------- Original Message --------
Subject: [PATCH] x86_64 out of line numa funcs are discontig only
Date: Wed, 11 Jan 2006 18:14:11 +0000
From: Andy Whitcroft <apw@shadowen.org>
To: Andrew Morton <akpm@osdl.org>
CC: Andi Kleen <ak@suse.de>
References: <20060111042135.24faf878.akpm@osdl.org>

x86_64 out of line numa funcs are discontig only

The following patch included in 2.6.15-mm3 moves the inline DISCONTIGMEM
page accessor functions into numa.c.  However, these are only used under
DISCONTIGMEM and need covered by CONFIG_DISCONTIGMEM:

    x86_64-out-of-line-numa-funcs.patch

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
 numa.c |    2 ++
 1 files changed, 2 insertions(+)
diff -upN reference/arch/x86_64/mm/numa.c current/arch/x86_64/mm/numa.c
--- reference/arch/x86_64/mm/numa.c
+++ current/arch/x86_64/mm/numa.c
@@ -361,6 +361,7 @@ EXPORT_SYMBOL(memnode_shift);
 EXPORT_SYMBOL(memnodemap);
 EXPORT_SYMBOL(node_data);

+#ifdef CONFIG_DISCONTIGMEM
 /*
  * Functions to convert PFNs from/to per node page addresses.
  * These are out of line because they are quite big.
@@ -394,3 +395,4 @@ int pfn_valid(unsigned long pfn)
 	return pfn >= node_start_pfn(nid) && (pfn) < node_end_pfn(nid);
 }
 EXPORT_SYMBOL(pfn_valid);
+#endif /* CONFIG_DISCONTIGMEM */