x86, apic: remove NUMAQ_IRQ_DELIVERY_MODE and NUMAQ_IRQ_DEST_MODE

Impact: cleanup

They were only used in a single place and obscured the apic_numaq template.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
index 7746035c5911395a7e28d20ffcd1549a16a02f4b..a9d846769a0228cf316be3a67e71bc6417b410d4 100644 (file)
--- a/arch/x86/include/asm/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
@@ -15,9 +15,6 @@ static inline const cpumask_t *target_cpus(void)
 #define NO_BALANCE_IRQ (1)
 #define esr_disable (1)
 
-#define NUMAQ_IRQ_DELIVERY_MODE dest_LowestPrio
-#define NUMAQ_IRQ_DEST_MODE 0     /* physical delivery on LOCAL quad */
- 
 static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
 {
        return physid_isset(apicid, bitmap);

diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 77ac66935fdd5de1cc564d1b90d162edb422beec..6daddb6949d2b4cb33307d83258ac69e84486300 100644 (file)
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -51,8 +51,9 @@ struct genapic apic_numaq = {
        .acpi_madt_oem_check            = NULL,
        .apic_id_registered             = numaq_apic_id_registered,
 
-       .irq_delivery_mode              = NUMAQ_IRQ_DELIVERY_MODE,
-       .irq_dest_mode                  = NUMAQ_IRQ_DEST_MODE,
+       .irq_delivery_mode              = dest_LowestPrio,
+       /* physical delivery on LOCAL quad: */
+       .irq_dest_mode                  = 0,
 
        .target_cpus                    = target_cpus,
        .ESR_DISABLE                    = esr_disable,