aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/mach-default
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 00:50:47 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-28 17:20:21 -0500
commita5c4329622a3437adef4b2a4288d127957743c97 (patch)
tree9eca2d48aba0da0265976b98e3e4122a3d93bc86 /arch/x86/include/asm/mach-default
parente2d40b1878bd13ca1028ddd299c48e4821ac3535 (diff)
x86, apic: clean up ->init_apic_ldr()
- separate the namespace - remove macros Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/mach-default')
-rw-r--r--arch/x86/include/asm/mach-default/mach_apic.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
index 9c56542644ca..23e0a2da3a96 100644
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ b/arch/x86/include/asm/mach-default/mach_apic.h
@@ -19,7 +19,6 @@ static inline const struct cpumask *default_target_cpus(void)
19 19
20#ifdef CONFIG_X86_64 20#ifdef CONFIG_X86_64
21#include <asm/genapic.h> 21#include <asm/genapic.h>
22#define init_apic_ldr (apic->init_apic_ldr)
23#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid) 22#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)
24#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and) 23#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)
25#define phys_pkg_id (apic->phys_pkg_id) 24#define phys_pkg_id (apic->phys_pkg_id)
@@ -36,7 +35,7 @@ extern void setup_apic_routing(void);
36 * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel 35 * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
37 * document number 292116). So here it goes... 36 * document number 292116). So here it goes...
38 */ 37 */
39static inline void init_apic_ldr(void) 38static inline void default_init_apic_ldr(void)
40{ 39{
41 unsigned long val; 40 unsigned long val;
42 41