diff options
| author |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 17:27:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 17:27:24 -0700 |
| commit | 16822e62053e73fa7def9decc38a7e287d27d980 (patch) | |
| tree | fc736377c5c7e23ee78569392ed31a6030289e44 /include | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [IA64] Fix pfn_to_nid() so the kernel compiles again for !CONFIG_DISCONTIGMEM. (diff) | |
| download | linux-dev-16822e62053e73fa7def9decc38a7e287d27d980.tar.xz linux-dev-16822e62053e73fa7def9decc38a7e287d27d980.zip | |
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 @@ #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) |