diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 00:50:47 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:21 -0500 |
commit | a5c4329622a3437adef4b2a4288d127957743c97 (patch) | |
tree | 9eca2d48aba0da0265976b98e3e4122a3d93bc86 /arch/x86/include/asm | |
parent | e2d40b1878bd13ca1028ddd299c48e4821ac3535 (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')
-rw-r--r-- | arch/x86/include/asm/bigsmp/apic.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/es7000/apic.h | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/mach-default/mach_apic.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/mach-generic/mach_apic.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/numaq/apic.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/summit/apic.h | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h index 916451252b3a..819413082999 100644 --- a/arch/x86/include/asm/bigsmp/apic.h +++ b/arch/x86/include/asm/bigsmp/apic.h | |||
@@ -46,7 +46,7 @@ static inline unsigned long calculate_ldr(int cpu) | |||
46 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | 46 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel |
47 | * document number 292116). So here it goes... | 47 | * document number 292116). So here it goes... |
48 | */ | 48 | */ |
49 | static inline void init_apic_ldr(void) | 49 | static inline void bigsmp_init_apic_ldr(void) |
50 | { | 50 | { |
51 | unsigned long val; | 51 | unsigned long val; |
52 | int cpu = smp_processor_id(); | 52 | int cpu = smp_processor_id(); |
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h index 847008a77029..06f5757bf7af 100644 --- a/arch/x86/include/asm/es7000/apic.h +++ b/arch/x86/include/asm/es7000/apic.h | |||
@@ -52,7 +52,7 @@ static inline unsigned long calculate_ldr(int cpu) | |||
52 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | 52 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel |
53 | * document number 292116). So here it goes... | 53 | * document number 292116). So here it goes... |
54 | */ | 54 | */ |
55 | static inline void init_apic_ldr_cluster(void) | 55 | static inline void es7000_init_apic_ldr_cluster(void) |
56 | { | 56 | { |
57 | unsigned long val; | 57 | unsigned long val; |
58 | int cpu = smp_processor_id(); | 58 | int cpu = smp_processor_id(); |
@@ -62,7 +62,7 @@ static inline void init_apic_ldr_cluster(void) | |||
62 | apic_write(APIC_LDR, val); | 62 | apic_write(APIC_LDR, val); |
63 | } | 63 | } |
64 | 64 | ||
65 | static inline void init_apic_ldr(void) | 65 | static inline void es7000_init_apic_ldr(void) |
66 | { | 66 | { |
67 | unsigned long val; | 67 | unsigned long val; |
68 | int cpu = smp_processor_id(); | 68 | int cpu = smp_processor_id(); |
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 | */ |
39 | static inline void init_apic_ldr(void) | 38 | static inline void default_init_apic_ldr(void) |
40 | { | 39 | { |
41 | unsigned long val; | 40 | unsigned long val; |
42 | 41 | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h index e94881af9625..8e51f4163944 100644 --- a/arch/x86/include/asm/mach-generic/mach_apic.h +++ b/arch/x86/include/asm/mach-generic/mach_apic.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #include <asm/genapic.h> | 4 | #include <asm/genapic.h> |
5 | 5 | ||
6 | #define init_apic_ldr (apic->init_apic_ldr) | ||
7 | #define ioapic_phys_id_map (apic->ioapic_phys_id_map) | 6 | #define ioapic_phys_id_map (apic->ioapic_phys_id_map) |
8 | #define setup_apic_routing (apic->setup_apic_routing) | 7 | #define setup_apic_routing (apic->setup_apic_routing) |
9 | #define multi_timer_check (apic->multi_timer_check) | 8 | #define multi_timer_check (apic->multi_timer_check) |
diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h index defee3496ad6..802297489a34 100644 --- a/arch/x86/include/asm/numaq/apic.h +++ b/arch/x86/include/asm/numaq/apic.h | |||
@@ -28,7 +28,7 @@ static inline int numaq_apic_id_registered(void) | |||
28 | return 1; | 28 | return 1; |
29 | } | 29 | } |
30 | 30 | ||
31 | static inline void init_apic_ldr(void) | 31 | static inline void numaq_init_apic_ldr(void) |
32 | { | 32 | { |
33 | /* Already done in NUMA-Q firmware */ | 33 | /* Already done in NUMA-Q firmware */ |
34 | } | 34 | } |
diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h index 51df002ecf4c..9108c89fe881 100644 --- a/arch/x86/include/asm/summit/apic.h +++ b/arch/x86/include/asm/summit/apic.h | |||
@@ -37,7 +37,7 @@ static inline unsigned long summit_check_apicid_present(int bit) | |||
37 | 37 | ||
38 | extern u8 cpu_2_logical_apicid[]; | 38 | extern u8 cpu_2_logical_apicid[]; |
39 | 39 | ||
40 | static inline void init_apic_ldr(void) | 40 | static inline void summit_init_apic_ldr(void) |
41 | { | 41 | { |
42 | unsigned long val, id; | 42 | unsigned long val, id; |
43 | int count = 0; | 43 | int count = 0; |