x86, apic: remove DEFAULT_IRQ_DELIVERY_MODE and DEFAULT_IRQ_DEST_MODE

Impact: cleanup

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

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

2 files changed, 3 insertions, 4 deletions

diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
index eafbf4f20387..f3b2cd423882 100644
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ b/arch/x86/include/asm/mach-default/mach_apic.h
@@ -34,8 +34,6 @@ static inline const struct cpumask *target_cpus(void)
 #define wakeup_secondary_cpu (apic->wakeup_cpu)
 extern void setup_apic_routing(void);
 #else
-#define DEFAULT_IRQ_DELIVERY_MODE dest_LowestPrio
-#define DEFAULT_IRQ_DEST_MODE 1     /* logical delivery broadcast to all procs */
 #define TARGET_CPUS (target_cpus())
 #define wakeup_secondary_cpu wakeup_secondary_cpu_via_init
 /*
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 0482106f0e19..fe97b0114a06 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -31,8 +31,9 @@ struct genapic apic_default = {
         .acpi_madt_oem_check            = NULL,
         .apic_id_registered             = default_apic_id_registered,
 
-        .irq_delivery_mode              = DEFAULT_IRQ_DELIVERY_MODE,
-        .irq_dest_mode                  = DEFAULT_IRQ_DEST_MODE,
+        .irq_delivery_mode              = dest_LowestPrio,
+        /* logical delivery broadcast to all CPUs: */
+        .irq_dest_mode                  = 1,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,