aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 17:27:24 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 17:27:24 -0700
commit16822e62053e73fa7def9decc38a7e287d27d980 (patch)
treefc736377c5c7e23ee78569392ed31a6030289e44 /include
parenta39451c17f53bbae053555670c7b678d46bcebba (diff)
parente608a8072b10258aa18c2e33324def225199ba1d (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/mmzone.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h
index 83ca4043fc1..d32f51e3d6c 100644
--- 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 long pfn)
#endif
}
-#ifdef CONFIG_DISCONTIGMEM
-
#ifdef CONFIG_IA64_DIG /* DIG systems are small */
# define MAX_PHYSNODE_ID 8
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 8)