Skip to content

Commit

Permalink
[PATCH] Fix up non-NUMA breakage in mmzone.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Jones authored and Linus Torvalds committed Jul 8, 2005
1 parent 8ff8b27 commit e8af300
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/asm-i386/mmzone.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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_ */

0 comments on commit e8af300

Please sign in to comment.