Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[powerpc.git] / include / asm-i386 / mmzone.h

diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 33ce5d3..620a906 100644 (file)
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -8,20 +8,15 @@
 
 #include <asm/smp.h>
 
-#if CONFIG_NUMA
+#ifdef CONFIG_NUMA
 extern struct pglist_data *node_data[];
 #define NODE_DATA(nid) (node_data[nid])
 
-#ifdef CONFIG_NUMA
-       #ifdef CONFIG_X86_NUMAQ
-               #include <asm/numaq.h>
-       #else   /* summit or generic arch */
-               #include <asm/srat.h>
-       #endif
-#else /* !CONFIG_NUMA */
-       #define get_memcfg_numa get_memcfg_numa_flat
-       #define get_zholes_size(n) (0)
-#endif /* CONFIG_NUMA */
+#ifdef CONFIG_X86_NUMAQ
+       #include <asm/numaq.h>
+#else  /* summit or generic arch */
+       #include <asm/srat.h>
+#endif
 
 extern int get_memcfg_numa_flat(void );
 /*
@@ -34,7 +29,7 @@ static inline void get_memcfg_numa(void)
 #ifdef CONFIG_X86_NUMAQ
        if (get_memcfg_numaq())
                return;
-#elif CONFIG_ACPI_SRAT
+#elif defined(CONFIG_ACPI_SRAT)
        if (get_memcfg_from_srat())
                return;
 #endif
@@ -42,6 +37,11 @@ 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)
 #endif /* CONFIG_NUMA */
 
 #ifdef CONFIG_DISCONTIGMEM
@@ -88,12 +88,6 @@ static inline int pfn_to_nid(unsigned long pfn)
        __pgdat->node_start_pfn + __pgdat->node_spanned_pages;          \
 })
 
-#define local_mapnr(kvaddr)                                            \
-({                                                                     \
-       unsigned long __pfn = __pa(kvaddr) >> PAGE_SHIFT;               \
-       (__pfn - node_start_pfn(pfn_to_nid(__pfn)));                    \
-})
-
 /* XXX: FIXME -- wli */
 #define kern_addr_valid(kaddr) (0)
 
@@ -151,6 +145,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_ */