|
@@ -528,18 +528,6 @@ static void es7000_apicid_to_cpu_present(int phys_apicid, physid_mask_t *retmap)
|
|
|
++cpu_id;
|
|
|
}
|
|
|
|
|
|
-/* Mapping from cpu number to logical apicid */
|
|
|
-static int es7000_cpu_to_logical_apicid(int cpu)
|
|
|
-{
|
|
|
-#ifdef CONFIG_SMP
|
|
|
- if (cpu >= nr_cpu_ids)
|
|
|
- return BAD_APICID;
|
|
|
- return early_per_cpu(x86_cpu_to_logical_apicid, cpu);
|
|
|
-#else
|
|
|
- return logical_smp_processor_id();
|
|
|
-#endif
|
|
|
-}
|
|
|
-
|
|
|
static void es7000_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)
|
|
|
{
|
|
|
/* For clustered we don't have a good way to do this yet - hack */
|
|
@@ -561,7 +549,7 @@ static unsigned int es7000_cpu_mask_to_apicid(const struct cpumask *cpumask)
|
|
|
* The cpus in the mask must all be on the apic cluster.
|
|
|
*/
|
|
|
for_each_cpu(cpu, cpumask) {
|
|
|
- int new_apicid = es7000_cpu_to_logical_apicid(cpu);
|
|
|
+ int new_apicid = early_per_cpu(x86_cpu_to_logical_apicid, cpu);
|
|
|
|
|
|
if (round && APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {
|
|
|
WARN(1, "Not a valid mask!");
|
|
@@ -578,7 +566,7 @@ static unsigned int
|
|
|
es7000_cpu_mask_to_apicid_and(const struct cpumask *inmask,
|
|
|
const struct cpumask *andmask)
|
|
|
{
|
|
|
- int apicid = es7000_cpu_to_logical_apicid(0);
|
|
|
+ int apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0);
|
|
|
cpumask_var_t cpumask;
|
|
|
|
|
|
if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC))
|
|
@@ -656,7 +644,6 @@ struct apic __refdata apic_es7000_cluster = {
|
|
|
.setup_apic_routing = es7000_setup_apic_routing,
|
|
|
.multi_timer_check = NULL,
|
|
|
.apicid_to_node = es7000_apicid_to_node,
|
|
|
- .cpu_to_logical_apicid = es7000_cpu_to_logical_apicid,
|
|
|
.cpu_present_to_apicid = es7000_cpu_present_to_apicid,
|
|
|
.apicid_to_cpu_present = es7000_apicid_to_cpu_present,
|
|
|
.setup_portio_remap = NULL,
|
|
@@ -721,7 +708,6 @@ struct apic __refdata apic_es7000 = {
|
|
|
.setup_apic_routing = es7000_setup_apic_routing,
|
|
|
.multi_timer_check = NULL,
|
|
|
.apicid_to_node = es7000_apicid_to_node,
|
|
|
- .cpu_to_logical_apicid = es7000_cpu_to_logical_apicid,
|
|
|
.cpu_present_to_apicid = es7000_cpu_present_to_apicid,
|
|
|
.apicid_to_cpu_present = es7000_apicid_to_cpu_present,
|
|
|
.setup_portio_remap = NULL,
|