public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] pfn_to_nid() compile-fix
@ 2005-06-23  5:24 David Mosberger-Tang
  0 siblings, 0 replies; only message in thread
From: David Mosberger-Tang @ 2005-06-23  5:24 UTC (permalink / raw)
  To: linux-ia64

Without this patch, the current git tree doesn't compile unless
CONFIG_DISCONTIGMEM is specified.  The problem is that linux/mmzone.h
defines its own version of pfn_to_nid in that case.

	--david

[IA64] Fix pfn_to_nid() so the kernel compiles again for !CONFIG_DISCONTIGMEM.

Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>

diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h
--- a/include/asm-ia64/mmzone.h
+++ b/include/asm-ia64/mmzone.h
@@ -15,6 +15,8 @@
 #include <asm/page.h>
 #include <asm/meminit.h>
 
+#ifdef CONFIG_DISCONTIGMEM
+
 static inline int pfn_to_nid(unsigned long pfn)
 {
 #ifdef CONFIG_NUMA
@@ -29,8 +31,6 @@ static inline int pfn_to_nid(unsigned lo
 #endif
 }
 
-#ifdef CONFIG_DISCONTIGMEM
-
 #ifdef CONFIG_IA64_DIG /* DIG systems are small */
 # define MAX_PHYSNODE_ID	8
 # define NR_NODE_MEMBLKS	(MAX_NUMNODES * 8)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-06-23  5:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-06-23  5:24 [patch] pfn_to_nid() compile-fix David Mosberger-Tang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox