aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/es7000_32.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-17 08:45:30 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-17 11:52:46 -0500
commit2f205bc47f615b7bd0c7aba817d67ce25760eaf1 (patch)
treedb0db390facd85e29bc14e58646ec5946ee0b665 /arch/x86/kernel/es7000_32.c
parent77313190d121dd1fffa965aff6e9f0782a307bb8 (diff)
x86, apic: clean up the cpu_2_logical_apiciddeclaration
extern declarations were scattered in 4 files - consolidate them into apic.h. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/es7000_32.c')
-rw-r--r--arch/x86/kernel/es7000_32.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c
index cf53a98dbf10..3dc48831eb95 100644
--- a/arch/x86/kernel/es7000_32.c
+++ b/arch/x86/kernel/es7000_32.c
@@ -403,7 +403,6 @@ void __init es7000_enable_apic_mode(void)
403 403
404extern void es7000_enable_apic_mode(void); 404extern void es7000_enable_apic_mode(void);
405extern int apic_version [MAX_APICS]; 405extern int apic_version [MAX_APICS];
406extern u8 cpu_2_logical_apicid[];
407extern unsigned int boot_cpu_physical_apicid; 406extern unsigned int boot_cpu_physical_apicid;
408 407
409extern int parse_unisys_oem (char *oemptr); 408extern int parse_unisys_oem (char *oemptr);
@@ -570,7 +569,7 @@ static int es7000_cpu_to_logical_apicid(int cpu)
570#ifdef CONFIG_SMP 569#ifdef CONFIG_SMP
571 if (cpu >= nr_cpu_ids) 570 if (cpu >= nr_cpu_ids)
572 return BAD_APICID; 571 return BAD_APICID;
573 return (int)cpu_2_logical_apicid[cpu]; 572 return cpu_2_logical_apicid[cpu];
574#else 573#else
575 return logical_smp_processor_id(); 574 return logical_smp_processor_id();
576#endif 575#endif