---

yaml --- r: 136568 b: refs/heads/master c: d8a3539 h: refs/heads/master v: v3
git-mirror · Jan 28, 2009 · 11d2b77 · 11d2b77
1 parent b2ce67c
commit 11d2b77
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b1bcb3ff4e4934d949574cec90679219ace5412
+refs/heads/master: d8a3539e64f8e27b0ab5bb7e7ba3b8f34b739224
diff --git a/trunk/arch/x86/include/asm/bigsmp/apic.h b/trunk/arch/x86/include/asm/bigsmp/apic.h
@@ -21,8 +21,6 @@ static inline const cpumask_t *target_cpus(void)
 #undef APIC_DEST_LOGICAL
 #define APIC_DEST_LOGICAL	0
 #define APIC_DFR_VALUE		(APIC_DFR_FLAT)
-#define BIGSMP_IRQ_DELIVERY_MODE (dest_Fixed)
-#define BIGSMP_IRQ_DEST_MODE	(0)    /* phys delivery to target proc */
 #define NO_BALANCE_IRQ		(0)
 
 static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)

diff --git a/trunk/arch/x86/mach-generic/bigsmp.c b/trunk/arch/x86/mach-generic/bigsmp.c
@@ -64,8 +64,9 @@ struct genapic apic_bigsmp = {
 	.acpi_madt_oem_check		= NULL,
 	.apic_id_registered		= bigsmp_apic_id_registered,
 
-	.irq_delivery_mode		= BIGSMP_IRQ_DELIVERY_MODE,
-	.irq_dest_mode			= BIGSMP_IRQ_DEST_MODE,
+	.irq_delivery_mode		= dest_Fixed,
+	/* phys delivery to target CPU: */
+	.irq_dest_mode			= 0,
 
 	.target_cpus			= target_cpus,
 	.ESR_DISABLE			= esr_disable,