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>

diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h
index bd52d4d86f0e404bbe6ff9765266ec25e2686f49..916451252b3a9a1ac3c67b1f82eb446eb5b97520 100644 (file)
--- 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)
 }
 
 #define APIC_DFR_VALUE         (APIC_DFR_FLAT)
-#define NO_BALANCE_IRQ         (0)
 
 static inline unsigned long
 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 cd888daa19308380f8c24d9c9bfe3146e7d0b630..847008a77029cd4df4911fe6ed737466335c8661 100644 (file)
--- 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)
 #define APIC_DFR_VALUE_CLUSTER         (APIC_DFR_CLUSTER)
 #define INT_DELIVERY_MODE_CLUSTER      (dest_LowestPrio)
 #define INT_DEST_MODE_CLUSTER          (1) /* logical delivery broadcast to all procs */
-#define NO_BALANCE_IRQ_CLUSTER         (1)
 
 #define APIC_DFR_VALUE         (APIC_DFR_FLAT)
-#define NO_BALANCE_IRQ         (0)
 
 static inline unsigned long
 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 f9d1ec018fd3c3a61dadfd0391eaad03955b751e..661898c2229cde0b7af6ea946cc11e81d2302d2d 100644 (file)
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -34,9 +34,6 @@ struct genapic {
        unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);
        unsigned long (*check_apicid_present)(int apicid);
 
-       int no_balance_irq;
-       int no_ioapic_check;
-
        void (*vector_allocation_domain)(int cpu, struct cpumask *retmask);
        void (*init_apic_ldr)(void);
 

diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
index 064bc11a991c042d1a1d9551eab5fe46ef731b2b..8adccf8ee473715ec9655b98ffb254f8ef228032 100644 (file)
--- 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)
 #endif
 } 
 
-#define NO_BALANCE_IRQ (0)
-
 #ifdef CONFIG_X86_64
 #include <asm/genapic.h>
 #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 e035f88dfcdec7d65a761eda450224d18e2aa756..4cb9e2b99e3767a86c4ad5787ecbf25581aff8ea 100644 (file)
--- a/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -3,7 +3,6 @@
 
 #include <asm/genapic.h>
 
-#define NO_BALANCE_IRQ (apic->no_balance_irq)
 #define init_apic_ldr (apic->init_apic_ldr)
 #define ioapic_phys_id_map (apic->ioapic_phys_id_map)
 #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 571fdaeafaa88bbe916aae6fbecded4205878f49..defee3496ad6aac7998251ce7ccf3a9ba8b73364 100644 (file)
--- 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)
        return &CPU_MASK_ALL;
 }
 
-#define NO_BALANCE_IRQ (1)
-
 static inline unsigned long
 numaq_check_apicid_used(physid_mask_t bitmap, int apicid)
 {

diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h
index 482038b244b06a0b80eff2e0030c65533876c0db..51df002ecf4c6dedb273212dc7a4e9c71489287b 100644 (file)
--- a/arch/x86/include/asm/summit/apic.h
+++ b/arch/x86/include/asm/summit/apic.h
@@ -4,8 +4,6 @@
 #include <asm/smp.h>
 #include <linux/gfp.h>
 
-#define NO_BALANCE_IRQ (0)
-
 /* In clustered mode, the high nibble of APIC ID is a cluster number.
  * The low nibble is a 4-bit bitmap. */
 #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 d22cbdaee2087402d56c72c90b5b09ca73fb5dd2..9446f372a16b5741f60dfcb3661e36ed7c1385e7 100644 (file)
--- a/arch/x86/kernel/genapic_flat_64.c
+++ b/arch/x86/kernel/genapic_flat_64.c
@@ -189,9 +189,6 @@ struct genapic apic_flat =  {
        .check_apicid_used              = NULL,
        .check_apicid_present           = NULL,
 
-       .no_balance_irq                 = 0,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = flat_vector_allocation_domain,
        .init_apic_ldr                  = flat_init_apic_ldr,
 
@@ -335,9 +332,6 @@ struct genapic apic_physflat =  {
        .check_apicid_used              = NULL,
        .check_apicid_present           = NULL,
 
-       .no_balance_irq                 = 0,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = physflat_vector_allocation_domain,
        /* not needed, but shouldn't hurt: */
        .init_apic_ldr                  = flat_init_apic_ldr,

diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c
index b91a48eae52e44454ea25524e583ee0d4259ad2d..2eeca6e744af3d5d3e05e15a48937c51eb83b816 100644 (file)
--- a/arch/x86/kernel/genx2apic_cluster.c
+++ b/arch/x86/kernel/genx2apic_cluster.c
@@ -191,9 +191,6 @@ struct genapic apic_x2apic_cluster = {
        .check_apicid_used              = NULL,
        .check_apicid_present           = NULL,
 
-       .no_balance_irq                 = 0,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = x2apic_vector_allocation_domain,
        .init_apic_ldr                  = init_x2apic_ldr,
 

diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c
index f070e86af0f4c6f2cc5f73991c91a501ec51e9ef..be0ee3e56ef1ea13cc5e766e96a8953f50e12081 100644 (file)
--- a/arch/x86/kernel/genx2apic_phys.c
+++ b/arch/x86/kernel/genx2apic_phys.c
@@ -187,9 +187,6 @@ struct genapic apic_x2apic_phys = {
        .check_apicid_used              = NULL,
        .check_apicid_present           = NULL,
 
-       .no_balance_irq                 = 0,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = x2apic_vector_allocation_domain,
        .init_apic_ldr                  = init_x2apic_ldr,
 

diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index c8a89158679967b8a5bd24e785ebcd0cda59aafa..68b423f3da992c004d0682350ca1abe94dc22ad9 100644 (file)
--- 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 = {
        .check_apicid_used              = NULL,
        .check_apicid_present           = NULL,
 
-       .no_balance_irq                 = 0,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = uv_vector_allocation_domain,
        .init_apic_ldr                  = uv_init_apic_ldr,
 

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index aa8443f6c0f7527d2926b93cc15c5d3e35851483..6da251aa9f4eeb897efd42e14ff2004bcbb09942 100644 (file)
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -74,9 +74,6 @@ struct genapic apic_bigsmp = {
        .check_apicid_used              = bigsmp_check_apicid_used,
        .check_apicid_present           = bigsmp_check_apicid_present,
 
-       .no_balance_irq                 = NO_BALANCE_IRQ,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = vector_allocation_domain,
        .init_apic_ldr                  = init_apic_ldr,
 

diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 47f6b5b06ba140a12786b2ae285869c4f66f63ba..e89e8c9dd68deba2af0bee05b70ea820b7637ca8 100644 (file)
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -41,9 +41,6 @@ struct genapic apic_default = {
        .check_apicid_used              = default_check_apicid_used,
        .check_apicid_present           = default_check_apicid_present,
 
-       .no_balance_irq                 = NO_BALANCE_IRQ,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = vector_allocation_domain,
        .init_apic_ldr                  = init_apic_ldr,
 

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 5633f3296e1c360979e0477fb32be113792c38a0..8e9eeecf7e2431ef111d9742ed4705f380302b71 100644 (file)
--- 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)
        apic->target_cpus = target_cpus_cluster;
        apic->irq_delivery_mode = INT_DELIVERY_MODE_CLUSTER;
        apic->irq_dest_mode = INT_DEST_MODE_CLUSTER;
-       apic->no_balance_irq = NO_BALANCE_IRQ_CLUSTER;
 
        apic->init_apic_ldr = init_apic_ldr_cluster;
 
@@ -117,9 +116,6 @@ struct genapic apic_es7000 = {
        .check_apicid_used              = es7000_check_apicid_used,
        .check_apicid_present           = es7000_check_apicid_present,
 
-       .no_balance_irq                 = NO_BALANCE_IRQ,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = vector_allocation_domain,
        .init_apic_ldr                  = init_apic_ldr,
 

diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index d85206d8e4ae52ca048a5bc2788b5314ecac6167..f909189fee3ecd51c3c19a4ea68c9d189d65a909 100644 (file)
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -61,9 +61,6 @@ struct genapic apic_numaq = {
        .check_apicid_used              = numaq_check_apicid_used,
        .check_apicid_present           = numaq_check_apicid_present,
 
-       .no_balance_irq                 = NO_BALANCE_IRQ,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = vector_allocation_domain,
        .init_apic_ldr                  = init_apic_ldr,
 

diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index f54cf73d3edb417d1392002f82b06678b5a8ad72..99a9bea8d1418b54d4fc7fd979a8323ec2528729 100644 (file)
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -54,9 +54,6 @@ struct genapic apic_summit = {
        .check_apicid_used              = summit_check_apicid_used,
        .check_apicid_present           = summit_check_apicid_present,
 
-       .no_balance_irq                 = NO_BALANCE_IRQ,
-       .no_ioapic_check                = 0,
-
        .vector_allocation_domain       = vector_allocation_domain,
        .init_apic_ldr                  = init_apic_ldr,