aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/es7000
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 04:30:40 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-28 23:20:17 +0100
commit0a9cc20b9c18372ba5a9fea990f5812f3ee01e32 (patch)
tree0682a72a3d9ff641059e4adc57e8c262f7539992 /arch/x86/include/asm/es7000
parent7fe732862d9697cc1863286fbcace9a67f231b4c (diff)
x86, apic: clean up target_cpus methods
Impact: cleanup Clean up all the target_cpus() namespace overlap that exists between bigsmp, es7000, mach-default, numaq and summit - by separating the different functions into different names. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/es7000')
-rw-r--r--arch/x86/include/asm/es7000/apic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index 342416b3fad..7e5c31a4f8d 100644
--- a/arch/x86/include/asm/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
@@ -16,7 +16,7 @@ static inline const cpumask_t *target_cpus_cluster(void)
return &CPU_MASK_ALL;
}
-static inline const cpumask_t *target_cpus(void)
+static inline const cpumask_t *es7000_target_cpus(void)
{
return &cpumask_of_cpu(smp_processor_id());
}
@@ -83,7 +83,7 @@ static inline void setup_apic_routing(void)
printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
(apic_version[apic] == 0x14) ?
"Physical Cluster" : "Logical Cluster",
- nr_ioapics, cpus_addr(*target_cpus())[0]);
+ nr_ioapics, cpus_addr(*es7000_target_cpus())[0]);
}
static inline int multi_timer_check(int apic, int irq)