[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>
This commit is contained in:
parent
8ff8b27bb8
commit
e8af300c3b
1 changed files with 2 additions and 2 deletions
|
@ -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_ */
|
||||
|
|
Loading…
Reference in a new issue