diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 22:30:40 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:17 -0500 |
commit | 0a9cc20b9c18372ba5a9fea990f5812f3ee01e32 (patch) | |
tree | 0682a72a3d9ff641059e4adc57e8c262f7539992 | |
parent | 7fe732862d9697cc1863286fbcace9a67f231b4c (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>
-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 | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/numaq/apic.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/summit/apic.h | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/bigsmp.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/default.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/es7000.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/numaq.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/summit.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h index dca2d5b01daa..d6aeca3c5a8d 100644 --- a/arch/x86/include/asm/bigsmp/apic.h +++ b/arch/x86/include/asm/bigsmp/apic.h | |||
@@ -9,7 +9,7 @@ static inline int bigsmp_apic_id_registered(void) | |||
9 | return 1; | 9 | return 1; |
10 | } | 10 | } |
11 | 11 | ||
12 | static inline const cpumask_t *target_cpus(void) | 12 | static inline const cpumask_t *bigsmp_target_cpus(void) |
13 | { | 13 | { |
14 | #ifdef CONFIG_SMP | 14 | #ifdef CONFIG_SMP |
15 | return &cpu_online_map; | 15 | return &cpu_online_map; |
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h index 342416b3fadd..7e5c31a4f8da 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) | |||
16 | return &CPU_MASK_ALL; | 16 | return &CPU_MASK_ALL; |
17 | } | 17 | } |
18 | 18 | ||
19 | static inline const cpumask_t *target_cpus(void) | 19 | static inline const cpumask_t *es7000_target_cpus(void) |
20 | { | 20 | { |
21 | return &cpumask_of_cpu(smp_processor_id()); | 21 | return &cpumask_of_cpu(smp_processor_id()); |
22 | } | 22 | } |
@@ -83,7 +83,7 @@ static inline void setup_apic_routing(void) | |||
83 | printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", | 83 | printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", |
84 | (apic_version[apic] == 0x14) ? | 84 | (apic_version[apic] == 0x14) ? |
85 | "Physical Cluster" : "Logical Cluster", | 85 | "Physical Cluster" : "Logical Cluster", |
86 | nr_ioapics, cpus_addr(*target_cpus())[0]); | 86 | nr_ioapics, cpus_addr(*es7000_target_cpus())[0]); |
87 | } | 87 | } |
88 | 88 | ||
89 | static inline int multi_timer_check(int apic, int irq) | 89 | static inline int multi_timer_check(int apic, int irq) |
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h index ce3bc4845b98..af1607ddd2a2 100644 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ b/arch/x86/include/asm/mach-default/mach_apic.h | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 9 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
10 | 10 | ||
11 | static inline const struct cpumask *target_cpus(void) | 11 | static inline const struct cpumask *default_target_cpus(void) |
12 | { | 12 | { |
13 | #ifdef CONFIG_SMP | 13 | #ifdef CONFIG_SMP |
14 | return cpu_online_mask; | 14 | return cpu_online_mask; |
@@ -33,7 +33,7 @@ static inline const struct cpumask *target_cpus(void) | |||
33 | #define wakeup_secondary_cpu (apic->wakeup_cpu) | 33 | #define wakeup_secondary_cpu (apic->wakeup_cpu) |
34 | extern void setup_apic_routing(void); | 34 | extern void setup_apic_routing(void); |
35 | #else | 35 | #else |
36 | #define TARGET_CPUS (target_cpus()) | 36 | #define TARGET_CPUS (default_target_cpus()) |
37 | #define wakeup_secondary_cpu wakeup_secondary_cpu_via_init | 37 | #define wakeup_secondary_cpu wakeup_secondary_cpu_via_init |
38 | /* | 38 | /* |
39 | * Set up the logical destination ID. | 39 | * Set up the logical destination ID. |
diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h index a9d846769a02..1111ff9e41de 100644 --- a/arch/x86/include/asm/numaq/apic.h +++ b/arch/x86/include/asm/numaq/apic.h | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) | 8 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) |
9 | 9 | ||
10 | static inline const cpumask_t *target_cpus(void) | 10 | static inline const cpumask_t *numaq_target_cpus(void) |
11 | { | 11 | { |
12 | return &CPU_MASK_ALL; | 12 | return &CPU_MASK_ALL; |
13 | } | 13 | } |
diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h index 427d0889f6f2..7c1f9151429c 100644 --- a/arch/x86/include/asm/summit/apic.h +++ b/arch/x86/include/asm/summit/apic.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) | 16 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) |
17 | 17 | ||
18 | static inline const cpumask_t *target_cpus(void) | 18 | static inline const cpumask_t *summit_target_cpus(void) |
19 | { | 19 | { |
20 | /* CPU_MASK_ALL (0xff) has undefined behaviour with | 20 | /* CPU_MASK_ALL (0xff) has undefined behaviour with |
21 | * dest_LowestPrio mode logical clustered apic interrupt routing | 21 | * dest_LowestPrio mode logical clustered apic interrupt routing |
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c index 06be776067ad..d3cead2d2fc8 100644 --- a/arch/x86/mach-generic/bigsmp.c +++ b/arch/x86/mach-generic/bigsmp.c | |||
@@ -68,7 +68,7 @@ struct genapic apic_bigsmp = { | |||
68 | /* phys delivery to target CPU: */ | 68 | /* phys delivery to target CPU: */ |
69 | .irq_dest_mode = 0, | 69 | .irq_dest_mode = 0, |
70 | 70 | ||
71 | .target_cpus = target_cpus, | 71 | .target_cpus = bigsmp_target_cpus, |
72 | .ESR_DISABLE = esr_disable, | 72 | .ESR_DISABLE = esr_disable, |
73 | .apic_destination_logical = APIC_DEST_LOGICAL, | 73 | .apic_destination_logical = APIC_DEST_LOGICAL, |
74 | .check_apicid_used = check_apicid_used, | 74 | .check_apicid_used = check_apicid_used, |
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index fe97b0114a06..a483e22273e5 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c | |||
@@ -35,7 +35,7 @@ struct genapic apic_default = { | |||
35 | /* logical delivery broadcast to all CPUs: */ | 35 | /* logical delivery broadcast to all CPUs: */ |
36 | .irq_dest_mode = 1, | 36 | .irq_dest_mode = 1, |
37 | 37 | ||
38 | .target_cpus = target_cpus, | 38 | .target_cpus = default_target_cpus, |
39 | .ESR_DISABLE = esr_disable, | 39 | .ESR_DISABLE = esr_disable, |
40 | .apic_destination_logical = APIC_DEST_LOGICAL, | 40 | .apic_destination_logical = APIC_DEST_LOGICAL, |
41 | .check_apicid_used = check_apicid_used, | 41 | .check_apicid_used = check_apicid_used, |
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index 269a97aef431..e31f0c35470d 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c | |||
@@ -111,7 +111,7 @@ struct genapic apic_es7000 = { | |||
111 | /* phys delivery to target CPUs: */ | 111 | /* phys delivery to target CPUs: */ |
112 | .irq_dest_mode = 0, | 112 | .irq_dest_mode = 0, |
113 | 113 | ||
114 | .target_cpus = target_cpus, | 114 | .target_cpus = es7000_target_cpus, |
115 | .ESR_DISABLE = esr_disable, | 115 | .ESR_DISABLE = esr_disable, |
116 | .apic_destination_logical = APIC_DEST_LOGICAL, | 116 | .apic_destination_logical = APIC_DEST_LOGICAL, |
117 | .check_apicid_used = check_apicid_used, | 117 | .check_apicid_used = check_apicid_used, |
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c index 6daddb6949d2..4b84b5970fbe 100644 --- a/arch/x86/mach-generic/numaq.c +++ b/arch/x86/mach-generic/numaq.c | |||
@@ -55,7 +55,7 @@ struct genapic apic_numaq = { | |||
55 | /* physical delivery on LOCAL quad: */ | 55 | /* physical delivery on LOCAL quad: */ |
56 | .irq_dest_mode = 0, | 56 | .irq_dest_mode = 0, |
57 | 57 | ||
58 | .target_cpus = target_cpus, | 58 | .target_cpus = numaq_target_cpus, |
59 | .ESR_DISABLE = esr_disable, | 59 | .ESR_DISABLE = esr_disable, |
60 | .apic_destination_logical = APIC_DEST_LOGICAL, | 60 | .apic_destination_logical = APIC_DEST_LOGICAL, |
61 | .check_apicid_used = check_apicid_used, | 61 | .check_apicid_used = check_apicid_used, |
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c index 1b9164b92b0a..e6b956a08484 100644 --- a/arch/x86/mach-generic/summit.c +++ b/arch/x86/mach-generic/summit.c | |||
@@ -48,7 +48,7 @@ struct genapic apic_summit = { | |||
48 | /* logical delivery broadcast to all CPUs: */ | 48 | /* logical delivery broadcast to all CPUs: */ |
49 | .irq_dest_mode = 1, | 49 | .irq_dest_mode = 1, |
50 | 50 | ||
51 | .target_cpus = target_cpus, | 51 | .target_cpus = summit_target_cpus, |
52 | .ESR_DISABLE = esr_disable, | 52 | .ESR_DISABLE = esr_disable, |
53 | .apic_destination_logical = APIC_DEST_LOGICAL, | 53 | .apic_destination_logical = APIC_DEST_LOGICAL, |
54 | .check_apicid_used = check_apicid_used, | 54 | .check_apicid_used = check_apicid_used, |