]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] Fix up non-NUMA breakage in mmzone.h
authorDave Jones <davej@redhat.com>
Fri, 8 Jul 2005 00:56:39 +0000 (17:56 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 8 Jul 2005 01:23:42 +0000 (18:23 -0700)
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>
include/asm-i386/mmzone.h

index 08e3cfd86328d50962b83701a7be4e491d1b26eb..516421300ea2d2346cfb084eefb276bd00b9ec18 100644 (file)
@@ -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_ */