x86: Use the same node_distance for 32 and 64-bit

[firefly-linux-kernel-4.4.55.git] / arch / x86 / include / asm / topology.h

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 910a7084f7f22dda7739d2b3d122d1c5be39ae33..800f77c600510e431947e2e92f32d950d3d6c6b7 100644 (file)
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -93,19 +93,11 @@ extern void setup_node_to_cpumask_map(void);
 #define pcibus_to_node(bus) __pcibus_to_node(bus)
 
 #ifdef CONFIG_X86_32
-extern unsigned long node_start_pfn[];
-extern unsigned long node_end_pfn[];
-extern unsigned long node_remap_size[];
-#define node_has_online_mem(nid) (node_start_pfn[nid] != node_end_pfn[nid])
-
 # define SD_CACHE_NICE_TRIES   1
 # define SD_IDLE_IDX           1
-
 #else
-
 # define SD_CACHE_NICE_TRIES   2
 # define SD_IDLE_IDX           2
-
 #endif
 
 /* sched_domains SD_NODE_INIT for NUMA machines */
@@ -138,10 +130,8 @@ extern unsigned long node_remap_size[];
        .balance_interval       = 1,                                    \
 }
 
-#ifdef CONFIG_X86_64
 extern int __node_distance(int, int);
 #define node_distance(a, b) __node_distance(a, b)
-#endif
 
 #else /* !CONFIG_NUMA */