revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / apic / io_apic.c

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 4d90327853b71dd4e960af4240cf80bf50c0e22b..5c5b8f3dddb58686ba4afc8b314237c0c318370b 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1397,7 +1397,6 @@ int setup_ioapic_entry(int apic_id, int irq,
                irte.dlvry_mode = apic->irq_delivery_mode;
                irte.vector = vector;
                irte.dest_id = IRTE_DEST(destination);
-               irte.redir_hint = 1;
 
                /* Set source-id of interrupt request */
                set_ioapic_sid(&irte, apic_id);
@@ -3349,7 +3348,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,
                irte.dlvry_mode = apic->irq_delivery_mode;
                irte.vector = cfg->vector;
                irte.dest_id = IRTE_DEST(dest);
-               irte.redir_hint = 1;
 
                /* Set source-id of interrupt request */
                if (pdev)
@@ -3626,7 +3624,6 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
        msg.data |= MSI_DATA_VECTOR(cfg->vector);
        msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
        msg.address_lo |= MSI_ADDR_DEST_ID(dest);
-       msg.address_hi = MSI_ADDR_BASE_HI | MSI_ADDR_EXT_DEST_ID(dest);
 
        dmar_msi_write(irq, &msg);