diff options
author | David Mosberger-Tang <davidm@hpl.hp.com> | 2005-06-23 01:24:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-23 17:52:51 -0400 |
commit | e608a8072b10258aa18c2e33324def225199ba1d (patch) | |
tree | 4b29a7e50c52a009ea7d38eb3935b57945edc88d /include/asm-ia64/mmzone.h | |
parent | a8ad86f2dc46356f87be1327dabc18bdbda32f50 (diff) |
[IA64] Fix pfn_to_nid() so the kernel compiles again for !CONFIG_DISCONTIGMEM.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64/mmzone.h')
-rw-r--r-- | include/asm-ia64/mmzone.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h index 83ca4043fc11..d32f51e3d6c2 100644 --- a/include/asm-ia64/mmzone.h +++ b/include/asm-ia64/mmzone.h | |||
@@ -15,6 +15,8 @@ | |||
15 | #include <asm/page.h> | 15 | #include <asm/page.h> |
16 | #include <asm/meminit.h> | 16 | #include <asm/meminit.h> |
17 | 17 | ||
18 | #ifdef CONFIG_DISCONTIGMEM | ||
19 | |||
18 | static inline int pfn_to_nid(unsigned long pfn) | 20 | static inline int pfn_to_nid(unsigned long pfn) |
19 | { | 21 | { |
20 | #ifdef CONFIG_NUMA | 22 | #ifdef CONFIG_NUMA |
@@ -29,8 +31,6 @@ static inline int pfn_to_nid(unsigned long pfn) | |||
29 | #endif | 31 | #endif |
30 | } | 32 | } |
31 | 33 | ||
32 | #ifdef CONFIG_DISCONTIGMEM | ||
33 | |||
34 | #ifdef CONFIG_IA64_DIG /* DIG systems are small */ | 34 | #ifdef CONFIG_IA64_DIG /* DIG systems are small */ |
35 | # define MAX_PHYSNODE_ID 8 | 35 | # define MAX_PHYSNODE_ID 8 |
36 | # define NR_NODE_MEMBLKS (MAX_NUMNODES * 8) | 36 | # define NR_NODE_MEMBLKS (MAX_NUMNODES * 8) |