aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/mmzone.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 33ce5d37e894..08e3cfd86328 100644
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -8,20 +8,15 @@
8 8
9#include <asm/smp.h> 9#include <asm/smp.h>
10 10
11#if CONFIG_NUMA 11#ifdef CONFIG_NUMA
12extern struct pglist_data *node_data[]; 12extern struct pglist_data *node_data[];
13#define NODE_DATA(nid) (node_data[nid]) 13#define NODE_DATA(nid) (node_data[nid])
14 14
15#ifdef CONFIG_NUMA 15#ifdef CONFIG_X86_NUMAQ
16 #ifdef CONFIG_X86_NUMAQ 16 #include <asm/numaq.h>
17 #include <asm/numaq.h> 17#else /* summit or generic arch */
18 #else /* summit or generic arch */ 18 #include <asm/srat.h>
19 #include <asm/srat.h> 19#endif
20 #endif
21#else /* !CONFIG_NUMA */
22 #define get_memcfg_numa get_memcfg_numa_flat
23 #define get_zholes_size(n) (0)
24#endif /* CONFIG_NUMA */
25 20
26extern int get_memcfg_numa_flat(void ); 21extern int get_memcfg_numa_flat(void );
27/* 22/*
@@ -42,6 +37,9 @@ static inline void get_memcfg_numa(void)
42 get_memcfg_numa_flat(); 37 get_memcfg_numa_flat();
43} 38}
44 39
40#else /* !CONFIG_NUMA */
41#define get_memcfg_numa get_memcfg_numa_flat
42#define get_zholes_size(n) (0)
45#endif /* CONFIG_NUMA */ 43#endif /* CONFIG_NUMA */
46 44
47#ifdef CONFIG_DISCONTIGMEM 45#ifdef CONFIG_DISCONTIGMEM