diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 23:57:56 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:20 -0500 |
commit | 2e867b17cc02e1799f18126af0ddd7b63dd8f6f4 (patch) | |
tree | c5c0cc37ded5fb8b9ced26550d99f7706cd3cea2 | |
parent | d1d7cae8fd54a301a0de531b48451649933ffdcf (diff) |
x86, apic: remove no_balance_irq and no_ioapic_check flags
These flags are completely unused. (the in-kernel IRQ balancer has
been removed from the upstream kernel.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/include/asm/bigsmp/apic.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/es7000/apic.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/genapic.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/mach-default/mach_apic.h | 2 | ||||
-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 | ||||
-rw-r--r-- | arch/x86/kernel/genapic_flat_64.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/genx2apic_cluster.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/genx2apic_phys.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/genx2apic_uv_x.c | 3 | ||||
-rw-r--r-- | arch/x86/mach-generic/bigsmp.c | 3 | ||||
-rw-r--r-- | arch/x86/mach-generic/default.c | 3 | ||||
-rw-r--r-- | arch/x86/mach-generic/es7000.c | 4 | ||||
-rw-r--r-- | arch/x86/mach-generic/numaq.c | 3 | ||||
-rw-r--r-- | arch/x86/mach-generic/summit.c | 3 |
16 files changed, 0 insertions, 44 deletions
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h index bd52d4d86f0e..916451252b3a 100644 --- a/arch/x86/include/asm/bigsmp/apic.h +++ b/arch/x86/include/asm/bigsmp/apic.h | |||
@@ -18,7 +18,6 @@ static inline const cpumask_t *bigsmp_target_cpus(void) | |||
18 | } | 18 | } |
19 | 19 | ||
20 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 20 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
21 | #define NO_BALANCE_IRQ (0) | ||
22 | 21 | ||
23 | static inline unsigned long | 22 | static inline unsigned long |
24 | bigsmp_check_apicid_used(physid_mask_t bitmap, int apicid) | 23 | bigsmp_check_apicid_used(physid_mask_t bitmap, int apicid) |
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h index cd888daa1930..847008a77029 100644 --- a/arch/x86/include/asm/es7000/apic.h +++ b/arch/x86/include/asm/es7000/apic.h | |||
@@ -23,10 +23,8 @@ static inline const cpumask_t *es7000_target_cpus(void) | |||
23 | #define APIC_DFR_VALUE_CLUSTER (APIC_DFR_CLUSTER) | 23 | #define APIC_DFR_VALUE_CLUSTER (APIC_DFR_CLUSTER) |
24 | #define INT_DELIVERY_MODE_CLUSTER (dest_LowestPrio) | 24 | #define INT_DELIVERY_MODE_CLUSTER (dest_LowestPrio) |
25 | #define INT_DEST_MODE_CLUSTER (1) /* logical delivery broadcast to all procs */ | 25 | #define INT_DEST_MODE_CLUSTER (1) /* logical delivery broadcast to all procs */ |
26 | #define NO_BALANCE_IRQ_CLUSTER (1) | ||
27 | 26 | ||
28 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 27 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
29 | #define NO_BALANCE_IRQ (0) | ||
30 | 28 | ||
31 | static inline unsigned long | 29 | static inline unsigned long |
32 | es7000_check_apicid_used(physid_mask_t bitmap, int apicid) | 30 | es7000_check_apicid_used(physid_mask_t bitmap, int apicid) |
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h index f9d1ec018fd3..661898c2229c 100644 --- a/arch/x86/include/asm/genapic.h +++ b/arch/x86/include/asm/genapic.h | |||
@@ -34,9 +34,6 @@ struct genapic { | |||
34 | unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); | 34 | unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); |
35 | unsigned long (*check_apicid_present)(int apicid); | 35 | unsigned long (*check_apicid_present)(int apicid); |
36 | 36 | ||
37 | int no_balance_irq; | ||
38 | int no_ioapic_check; | ||
39 | |||
40 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); | 37 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); |
41 | void (*init_apic_ldr)(void); | 38 | void (*init_apic_ldr)(void); |
42 | 39 | ||
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h index 064bc11a991c..8adccf8ee473 100644 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ b/arch/x86/include/asm/mach-default/mach_apic.h | |||
@@ -17,8 +17,6 @@ static inline const struct cpumask *default_target_cpus(void) | |||
17 | #endif | 17 | #endif |
18 | } | 18 | } |
19 | 19 | ||
20 | #define NO_BALANCE_IRQ (0) | ||
21 | |||
22 | #ifdef CONFIG_X86_64 | 20 | #ifdef CONFIG_X86_64 |
23 | #include <asm/genapic.h> | 21 | #include <asm/genapic.h> |
24 | #define init_apic_ldr (apic->init_apic_ldr) | 22 | #define init_apic_ldr (apic->init_apic_ldr) |
diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h index e035f88dfcde..4cb9e2b99e37 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 NO_BALANCE_IRQ (apic->no_balance_irq) | ||
7 | #define init_apic_ldr (apic->init_apic_ldr) | 6 | #define init_apic_ldr (apic->init_apic_ldr) |
8 | #define ioapic_phys_id_map (apic->ioapic_phys_id_map) | 7 | #define ioapic_phys_id_map (apic->ioapic_phys_id_map) |
9 | #define setup_apic_routing (apic->setup_apic_routing) | 8 | #define setup_apic_routing (apic->setup_apic_routing) |
diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h index 571fdaeafaa8..defee3496ad6 100644 --- a/arch/x86/include/asm/numaq/apic.h +++ b/arch/x86/include/asm/numaq/apic.h | |||
@@ -12,8 +12,6 @@ static inline const cpumask_t *numaq_target_cpus(void) | |||
12 | return &CPU_MASK_ALL; | 12 | return &CPU_MASK_ALL; |
13 | } | 13 | } |
14 | 14 | ||
15 | #define NO_BALANCE_IRQ (1) | ||
16 | |||
17 | static inline unsigned long | 15 | static inline unsigned long |
18 | numaq_check_apicid_used(physid_mask_t bitmap, int apicid) | 16 | numaq_check_apicid_used(physid_mask_t bitmap, int apicid) |
19 | { | 17 | { |
diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h index 482038b244b0..51df002ecf4c 100644 --- a/arch/x86/include/asm/summit/apic.h +++ b/arch/x86/include/asm/summit/apic.h | |||
@@ -4,8 +4,6 @@ | |||
4 | #include <asm/smp.h> | 4 | #include <asm/smp.h> |
5 | #include <linux/gfp.h> | 5 | #include <linux/gfp.h> |
6 | 6 | ||
7 | #define NO_BALANCE_IRQ (0) | ||
8 | |||
9 | /* In clustered mode, the high nibble of APIC ID is a cluster number. | 7 | /* In clustered mode, the high nibble of APIC ID is a cluster number. |
10 | * The low nibble is a 4-bit bitmap. */ | 8 | * The low nibble is a 4-bit bitmap. */ |
11 | #define XAPIC_DEST_CPUS_SHIFT 4 | 9 | #define XAPIC_DEST_CPUS_SHIFT 4 |
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c index d22cbdaee208..9446f372a16b 100644 --- a/arch/x86/kernel/genapic_flat_64.c +++ b/arch/x86/kernel/genapic_flat_64.c | |||
@@ -189,9 +189,6 @@ struct genapic apic_flat = { | |||
189 | .check_apicid_used = NULL, | 189 | .check_apicid_used = NULL, |
190 | .check_apicid_present = NULL, | 190 | .check_apicid_present = NULL, |
191 | 191 | ||
192 | .no_balance_irq = 0, | ||
193 | .no_ioapic_check = 0, | ||
194 | |||
195 | .vector_allocation_domain = flat_vector_allocation_domain, | 192 | .vector_allocation_domain = flat_vector_allocation_domain, |
196 | .init_apic_ldr = flat_init_apic_ldr, | 193 | .init_apic_ldr = flat_init_apic_ldr, |
197 | 194 | ||
@@ -335,9 +332,6 @@ struct genapic apic_physflat = { | |||
335 | .check_apicid_used = NULL, | 332 | .check_apicid_used = NULL, |
336 | .check_apicid_present = NULL, | 333 | .check_apicid_present = NULL, |
337 | 334 | ||
338 | .no_balance_irq = 0, | ||
339 | .no_ioapic_check = 0, | ||
340 | |||
341 | .vector_allocation_domain = physflat_vector_allocation_domain, | 335 | .vector_allocation_domain = physflat_vector_allocation_domain, |
342 | /* not needed, but shouldn't hurt: */ | 336 | /* not needed, but shouldn't hurt: */ |
343 | .init_apic_ldr = flat_init_apic_ldr, | 337 | .init_apic_ldr = flat_init_apic_ldr, |
diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c index b91a48eae52e..2eeca6e744af 100644 --- a/arch/x86/kernel/genx2apic_cluster.c +++ b/arch/x86/kernel/genx2apic_cluster.c | |||
@@ -191,9 +191,6 @@ struct genapic apic_x2apic_cluster = { | |||
191 | .check_apicid_used = NULL, | 191 | .check_apicid_used = NULL, |
192 | .check_apicid_present = NULL, | 192 | .check_apicid_present = NULL, |
193 | 193 | ||
194 | .no_balance_irq = 0, | ||
195 | .no_ioapic_check = 0, | ||
196 | |||
197 | .vector_allocation_domain = x2apic_vector_allocation_domain, | 194 | .vector_allocation_domain = x2apic_vector_allocation_domain, |
198 | .init_apic_ldr = init_x2apic_ldr, | 195 | .init_apic_ldr = init_x2apic_ldr, |
199 | 196 | ||
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c index f070e86af0f4..be0ee3e56ef1 100644 --- a/arch/x86/kernel/genx2apic_phys.c +++ b/arch/x86/kernel/genx2apic_phys.c | |||
@@ -187,9 +187,6 @@ struct genapic apic_x2apic_phys = { | |||
187 | .check_apicid_used = NULL, | 187 | .check_apicid_used = NULL, |
188 | .check_apicid_present = NULL, | 188 | .check_apicid_present = NULL, |
189 | 189 | ||
190 | .no_balance_irq = 0, | ||
191 | .no_ioapic_check = 0, | ||
192 | |||
193 | .vector_allocation_domain = x2apic_vector_allocation_domain, | 190 | .vector_allocation_domain = x2apic_vector_allocation_domain, |
194 | .init_apic_ldr = init_x2apic_ldr, | 191 | .init_apic_ldr = init_x2apic_ldr, |
195 | 192 | ||
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c index c8a891586799..68b423f3da99 100644 --- a/arch/x86/kernel/genx2apic_uv_x.c +++ b/arch/x86/kernel/genx2apic_uv_x.c | |||
@@ -252,9 +252,6 @@ struct genapic apic_x2apic_uv_x = { | |||
252 | .check_apicid_used = NULL, | 252 | .check_apicid_used = NULL, |
253 | .check_apicid_present = NULL, | 253 | .check_apicid_present = NULL, |
254 | 254 | ||
255 | .no_balance_irq = 0, | ||
256 | .no_ioapic_check = 0, | ||
257 | |||
258 | .vector_allocation_domain = uv_vector_allocation_domain, | 255 | .vector_allocation_domain = uv_vector_allocation_domain, |
259 | .init_apic_ldr = uv_init_apic_ldr, | 256 | .init_apic_ldr = uv_init_apic_ldr, |
260 | 257 | ||
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c index aa8443f6c0f7..6da251aa9f4e 100644 --- a/arch/x86/mach-generic/bigsmp.c +++ b/arch/x86/mach-generic/bigsmp.c | |||
@@ -74,9 +74,6 @@ struct genapic apic_bigsmp = { | |||
74 | .check_apicid_used = bigsmp_check_apicid_used, | 74 | .check_apicid_used = bigsmp_check_apicid_used, |
75 | .check_apicid_present = bigsmp_check_apicid_present, | 75 | .check_apicid_present = bigsmp_check_apicid_present, |
76 | 76 | ||
77 | .no_balance_irq = NO_BALANCE_IRQ, | ||
78 | .no_ioapic_check = 0, | ||
79 | |||
80 | .vector_allocation_domain = vector_allocation_domain, | 77 | .vector_allocation_domain = vector_allocation_domain, |
81 | .init_apic_ldr = init_apic_ldr, | 78 | .init_apic_ldr = init_apic_ldr, |
82 | 79 | ||
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index 47f6b5b06ba1..e89e8c9dd68d 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c | |||
@@ -41,9 +41,6 @@ struct genapic apic_default = { | |||
41 | .check_apicid_used = default_check_apicid_used, | 41 | .check_apicid_used = default_check_apicid_used, |
42 | .check_apicid_present = default_check_apicid_present, | 42 | .check_apicid_present = default_check_apicid_present, |
43 | 43 | ||
44 | .no_balance_irq = NO_BALANCE_IRQ, | ||
45 | .no_ioapic_check = 0, | ||
46 | |||
47 | .vector_allocation_domain = vector_allocation_domain, | 44 | .vector_allocation_domain = vector_allocation_domain, |
48 | .init_apic_ldr = init_apic_ldr, | 45 | .init_apic_ldr = init_apic_ldr, |
49 | 46 | ||
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index 5633f3296e1c..8e9eeecf7e24 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c | |||
@@ -23,7 +23,6 @@ void __init es7000_update_genapic_to_cluster(void) | |||
23 | apic->target_cpus = target_cpus_cluster; | 23 | apic->target_cpus = target_cpus_cluster; |
24 | apic->irq_delivery_mode = INT_DELIVERY_MODE_CLUSTER; | 24 | apic->irq_delivery_mode = INT_DELIVERY_MODE_CLUSTER; |
25 | apic->irq_dest_mode = INT_DEST_MODE_CLUSTER; | 25 | apic->irq_dest_mode = INT_DEST_MODE_CLUSTER; |
26 | apic->no_balance_irq = NO_BALANCE_IRQ_CLUSTER; | ||
27 | 26 | ||
28 | apic->init_apic_ldr = init_apic_ldr_cluster; | 27 | apic->init_apic_ldr = init_apic_ldr_cluster; |
29 | 28 | ||
@@ -117,9 +116,6 @@ struct genapic apic_es7000 = { | |||
117 | .check_apicid_used = es7000_check_apicid_used, | 116 | .check_apicid_used = es7000_check_apicid_used, |
118 | .check_apicid_present = es7000_check_apicid_present, | 117 | .check_apicid_present = es7000_check_apicid_present, |
119 | 118 | ||
120 | .no_balance_irq = NO_BALANCE_IRQ, | ||
121 | .no_ioapic_check = 0, | ||
122 | |||
123 | .vector_allocation_domain = vector_allocation_domain, | 119 | .vector_allocation_domain = vector_allocation_domain, |
124 | .init_apic_ldr = init_apic_ldr, | 120 | .init_apic_ldr = init_apic_ldr, |
125 | 121 | ||
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c index d85206d8e4ae..f909189fee3e 100644 --- a/arch/x86/mach-generic/numaq.c +++ b/arch/x86/mach-generic/numaq.c | |||
@@ -61,9 +61,6 @@ struct genapic apic_numaq = { | |||
61 | .check_apicid_used = numaq_check_apicid_used, | 61 | .check_apicid_used = numaq_check_apicid_used, |
62 | .check_apicid_present = numaq_check_apicid_present, | 62 | .check_apicid_present = numaq_check_apicid_present, |
63 | 63 | ||
64 | .no_balance_irq = NO_BALANCE_IRQ, | ||
65 | .no_ioapic_check = 0, | ||
66 | |||
67 | .vector_allocation_domain = vector_allocation_domain, | 64 | .vector_allocation_domain = vector_allocation_domain, |
68 | .init_apic_ldr = init_apic_ldr, | 65 | .init_apic_ldr = init_apic_ldr, |
69 | 66 | ||
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c index f54cf73d3edb..99a9bea8d141 100644 --- a/arch/x86/mach-generic/summit.c +++ b/arch/x86/mach-generic/summit.c | |||
@@ -54,9 +54,6 @@ struct genapic apic_summit = { | |||
54 | .check_apicid_used = summit_check_apicid_used, | 54 | .check_apicid_used = summit_check_apicid_used, |
55 | .check_apicid_present = summit_check_apicid_present, | 55 | .check_apicid_present = summit_check_apicid_present, |
56 | 56 | ||
57 | .no_balance_irq = NO_BALANCE_IRQ, | ||
58 | .no_ioapic_check = 0, | ||
59 | |||
60 | .vector_allocation_domain = vector_allocation_domain, | 57 | .vector_allocation_domain = vector_allocation_domain, |
61 | .init_apic_ldr = init_apic_ldr, | 58 | .init_apic_ldr = init_apic_ldr, |
62 | 59 | ||