aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/apic.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r--arch/x86/include/asm/apic.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index efb073b5c743..ad30ca4b6fe9 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -306,7 +306,6 @@ struct apic {
306 306
307 void (*setup_apic_routing)(void); 307 void (*setup_apic_routing)(void);
308 int (*multi_timer_check)(int apic, int irq); 308 int (*multi_timer_check)(int apic, int irq);
309 int (*apicid_to_node)(int logical_apicid);
310 int (*cpu_present_to_apicid)(int mps_cpu); 309 int (*cpu_present_to_apicid)(int mps_cpu);
311 void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap); 310 void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);
312 void (*setup_portio_remap)(void); 311 void (*setup_portio_remap)(void);
@@ -367,6 +366,9 @@ struct apic {
367 * won't be applied properly during early boot in this case. 366 * won't be applied properly during early boot in this case.
368 */ 367 */
369 int (*x86_32_early_logical_apicid)(int cpu); 368 int (*x86_32_early_logical_apicid)(int cpu);
369
370 /* determine CPU -> NUMA node mapping */
371 int (*x86_32_numa_cpu_node)(int cpu);
370#endif 372#endif
371}; 373};
372 374
@@ -539,7 +541,7 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb)
539 return cpuid_apic >> index_msb; 541 return cpuid_apic >> index_msb;
540} 542}
541 543
542extern int default_apicid_to_node(int logical_apicid); 544extern int default_x86_32_numa_cpu_node(int cpu);
543 545
544#endif 546#endif
545 547