diff options
| author | Dave Jones <davej@redhat.com> | 2005-07-07 17:56:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 18:23:42 -0700 |
| commit | e8af300c3bd87b2310f1e7a642f37e0fe49a754b (patch) | |
| tree | 3a4d7be252aef85fb93cd6ac65dcd9a983f5bdd8 /include/asm-i386/mmzone.h | |
| parent | 8ff8b27bb8ebfd863b49653da1b7bbd8609fcd7e (diff) | |
| download | linux-e8af300c3bd87b2310f1e7a642f37e0fe49a754b.tar.gz linux-e8af300c3bd87b2310f1e7a642f37e0fe49a754b.tar.bz2 linux-e8af300c3bd87b2310f1e7a642f37e0fe49a754b.zip | |
[PATCH] Fix up non-NUMA breakage in mmzone.h
If CONFIG_NUMA isn't set, we use the define in <linux/mmzone.h> for
early_pfn_to_nid (which defines it to 0).
Because of this, the prototype needs to move inside the CONFIG_NUMA too, or
anal gcc's get really confused.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/mmzone.h')
| -rw-r--r-- | include/asm-i386/mmzone.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h index 08e3cfd86328..516421300ea2 100644 --- a/include/asm-i386/mmzone.h +++ b/include/asm-i386/mmzone.h @@ -37,6 +37,8 @@ static inline void get_memcfg_numa(void) get_memcfg_numa_flat(); } +extern int early_pfn_to_nid(unsigned long pfn); + #else /* !CONFIG_NUMA */ #define get_memcfg_numa get_memcfg_numa_flat #define get_zholes_size(n) (0) @@ -149,6 +151,4 @@ static inline int pfn_valid(int pfn) #endif /* CONFIG_NEED_MULTIPLE_NODES */ -extern int early_pfn_to_nid(unsigned long pfn); - #endif /* _ASM_MMZONE_H_ */ |