diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 20:27:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 20:27:24 -0400 |
| commit | 16822e62053e73fa7def9decc38a7e287d27d980 (patch) | |
| tree | fc736377c5c7e23ee78569392ed31a6030289e44 /include | |
| parent | a39451c17f53bbae053555670c7b678d46bcebba (diff) | |
| parent | e608a8072b10258aa18c2e33324def225199ba1d (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.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) |