aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/bigsmp/apic.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/bigsmp/apic.h')
-rw-r--r--arch/x86/include/asm/bigsmp/apic.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h
index 77f0b7348755..d0d894ff7d3e 100644
--- a/arch/x86/include/asm/bigsmp/apic.h
+++ b/arch/x86/include/asm/bigsmp/apic.h
@@ -82,7 +82,7 @@ static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)
82 82
83extern u8 cpu_2_logical_apicid[]; 83extern u8 cpu_2_logical_apicid[];
84/* Mapping from cpu number to logical apicid */ 84/* Mapping from cpu number to logical apicid */
85static inline int cpu_to_logical_apicid(int cpu) 85static inline int bigsmp_cpu_to_logical_apicid(int cpu)
86{ 86{
87 if (cpu >= nr_cpu_ids) 87 if (cpu >= nr_cpu_ids)
88 return BAD_APICID; 88 return BAD_APICID;
@@ -115,7 +115,7 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)
115 int apicid; 115 int apicid;
116 116
117 cpu = first_cpu(*cpumask); 117 cpu = first_cpu(*cpumask);
118 apicid = cpu_to_logical_apicid(cpu); 118 apicid = bigsmp_cpu_to_logical_apicid(cpu);
119 return apicid; 119 return apicid;
120} 120}
121 121
@@ -132,7 +132,7 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,
132 if (cpumask_test_cpu(cpu, cpu_online_mask)) 132 if (cpumask_test_cpu(cpu, cpu_online_mask))
133 break; 133 break;
134 if (cpu < nr_cpu_ids) 134 if (cpu < nr_cpu_ids)
135 return cpu_to_logical_apicid(cpu); 135 return bigsmp_cpu_to_logical_apicid(cpu);
136 136
137 return BAD_APICID; 137 return BAD_APICID;
138} 138}