diff options
-rw-r--r-- | arch/x86/include/asm/bigsmp/apic.h | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/bigsmp.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h index 293551b0e610..dca2d5b01daa 100644 --- a/arch/x86/include/asm/bigsmp/apic.h +++ b/arch/x86/include/asm/bigsmp/apic.h | |||
@@ -21,8 +21,6 @@ static inline const cpumask_t *target_cpus(void) | |||
21 | #undef APIC_DEST_LOGICAL | 21 | #undef APIC_DEST_LOGICAL |
22 | #define APIC_DEST_LOGICAL 0 | 22 | #define APIC_DEST_LOGICAL 0 |
23 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 23 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
24 | #define BIGSMP_IRQ_DELIVERY_MODE (dest_Fixed) | ||
25 | #define BIGSMP_IRQ_DEST_MODE (0) /* phys delivery to target proc */ | ||
26 | #define NO_BALANCE_IRQ (0) | 24 | #define NO_BALANCE_IRQ (0) |
27 | 25 | ||
28 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | 26 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) |
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c index e8c1ceca7c94..06be776067ad 100644 --- a/arch/x86/mach-generic/bigsmp.c +++ b/arch/x86/mach-generic/bigsmp.c | |||
@@ -64,8 +64,9 @@ struct genapic apic_bigsmp = { | |||
64 | .acpi_madt_oem_check = NULL, | 64 | .acpi_madt_oem_check = NULL, |
65 | .apic_id_registered = bigsmp_apic_id_registered, | 65 | .apic_id_registered = bigsmp_apic_id_registered, |
66 | 66 | ||
67 | .irq_delivery_mode = BIGSMP_IRQ_DELIVERY_MODE, | 67 | .irq_delivery_mode = dest_Fixed, |
68 | .irq_dest_mode = BIGSMP_IRQ_DEST_MODE, | 68 | /* phys delivery to target CPU: */ |
69 | .irq_dest_mode = 0, | ||
69 | 70 | ||
70 | .target_cpus = target_cpus, | 71 | .target_cpus = target_cpus, |
71 | .ESR_DISABLE = esr_disable, | 72 | .ESR_DISABLE = esr_disable, |