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 7746035..a9d8467 100644
--- a/arch/x86/include/asm/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
@@ -15,9 +15,6 @@
#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 77ac669..6daddb6 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -51,8 +51,9 @@
.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,