diff options
| author | David Mosberger-Tang <davidm@hpl.hp.com> | 2005-06-23 07:24:00 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-23 23:52:51 +0200 |
| commit | e608a8072b10258aa18c2e33324def225199ba1d (patch) | |
| tree | 4b29a7e50c52a009ea7d38eb3935b57945edc88d /include/asm-ia64 | |
| parent | [PATCH] Add removal schedule of register_serial/unregister_serial to appropri... (diff) | |
| download | linux-e608a8072b10258aa18c2e33324def225199ba1d.tar.xz linux-e608a8072b10258aa18c2e33324def225199ba1d.zip | |
[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')
| -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 @@ #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) |