Skip to contentSkip to conversation

pfn_to_nid() compile-fix

PATCH New David Mosberger-Tang 1 participant 1 message Jun 23, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pfn_to_nid() compile-fix

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.

include/asm-ia64/mmzone.h +2 -2
@@ -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)