aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/es7000_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic/es7000_32.c')
-rw-r--r--arch/x86/kernel/apic/es7000_32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 1322f5409e20..26d3a3eba75b 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -460,9 +460,9 @@ static const cpumask_t *target_cpus_cluster(void)
460 return cpu_all_mask; 460 return cpu_all_mask;
461} 461}
462 462
463static const cpumask_t *es7000_target_cpus(void) 463static const struct cpumask *es7000_target_cpus(void)
464{ 464{
465 return &cpumask_of_cpu(smp_processor_id()); 465 return cpumask_of(smp_processor_id());
466} 466}
467 467
468static unsigned long 468static unsigned long
@@ -517,7 +517,7 @@ static void es7000_setup_apic_routing(void)
517 "Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", 517 "Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
518 (apic_version[apic] == 0x14) ? 518 (apic_version[apic] == 0x14) ?
519 "Physical Cluster" : "Logical Cluster", 519 "Physical Cluster" : "Logical Cluster",
520 nr_ioapics, cpus_addr(*es7000_target_cpus())[0]); 520 nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);
521} 521}
522 522
523static int es7000_apicid_to_node(int logical_apicid) 523static int es7000_apicid_to_node(int logical_apicid)