diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:43 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:47 -0400 |
| commit | aff364860aa105b2deacc6f21ec8ef524460e3fc (patch) | |
| tree | 18409ebe16b25b141598da9b6386d69416c06afa /arch/x86/include/asm/topology.h | |
| parent | c7a7b814c9dca9ee01b38e63b4a46de87156d3b6 (diff) | |
| parent | 993ba1585cbb03fab012e41d1a5d24330a283b31 (diff) | |
Merge branch 'x86/numa' into x86-mm
Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab541^..993ba1585c.
3fe14ab541: x86-32, numa: Fix failure condition check in alloc_remap()
993ba1585c: x86-32, numa: Update remap allocator comments
Scheduled NUMA init 32/64bit unification changes depend on them.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/topology.h')
| -rw-r--r-- | arch/x86/include/asm/topology.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 910a7084f7f..8dba76972fd 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -95,7 +95,6 @@ extern void setup_node_to_cpumask_map(void); | |||
| 95 | #ifdef CONFIG_X86_32 | 95 | #ifdef CONFIG_X86_32 |
| 96 | extern unsigned long node_start_pfn[]; | 96 | extern unsigned long node_start_pfn[]; |
| 97 | extern unsigned long node_end_pfn[]; | 97 | extern unsigned long node_end_pfn[]; |
| 98 | extern unsigned long node_remap_size[]; | ||
| 99 | #define node_has_online_mem(nid) (node_start_pfn[nid] != node_end_pfn[nid]) | 98 | #define node_has_online_mem(nid) (node_start_pfn[nid] != node_end_pfn[nid]) |
| 100 | 99 | ||
| 101 | # define SD_CACHE_NICE_TRIES 1 | 100 | # define SD_CACHE_NICE_TRIES 1 |