From b2ce67c54058813caa4390c7fc4cc1d180074592 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 28 Jan 2009 04:16:01 +0100 Subject: [PATCH] --- yaml --- r: 136567 b: refs/heads/master c: 1b1bcb3ff4e4934d949574cec90679219ace5412 h: refs/heads/master i: 136565: 574d8dff0648d4244b22dae734f988542ae8e13c 136563: 38426032bacc9d0a63abc3c920edb6759a9cbcf8 136559: be60382a68d41dfdf7644256609244bf40da3944 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/numaq/apic.h | 3 --- trunk/arch/x86/mach-generic/numaq.c | 5 +++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ce52ffa7cfae..60925421fe2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82daea6b0890f739be1ad4ab1c1b922b1555582e +refs/heads/master: 1b1bcb3ff4e4934d949574cec90679219ace5412 diff --git a/trunk/arch/x86/include/asm/numaq/apic.h b/trunk/arch/x86/include/asm/numaq/apic.h index 7746035c5911..a9d846769a02 100644 --- a/trunk/arch/x86/include/asm/numaq/apic.h +++ b/trunk/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/trunk/arch/x86/mach-generic/numaq.c b/trunk/arch/x86/mach-generic/numaq.c index 77ac66935fdd..6daddb6949d2 100644 --- a/trunk/arch/x86/mach-generic/numaq.c +++ b/trunk/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,