diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 17:46:10 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 17:46:10 -0800 |
| commit | 54640cfe47251cd8acd7145ff86bcaf4db0e9616 (patch) | |
| tree | 8bfe98c0f56a9447c2514d89eaf742e88acdd0a2 /arch/x86/kernel | |
| parent | 5edfa05a10a7a545f085b5bdf1a79567b4470d4e (diff) | |
| parent | 702c0ce9a7c7ad1b22883aa82d8c29eaa6e65aab (diff) | |
Merge tag 'v4.4.49' into android-4.4.y
This is the 4.4.49 stable release
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 1e5d2f07416b..8ca533b8c606 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1875,7 +1875,6 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ack_level, .irq_set_affinity = ioapic_set_affinity, - .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, }; @@ -1887,7 +1886,6 @@ static struct irq_chip ioapic_ir_chip __read_mostly = { .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ir_ack_level, .irq_set_affinity = ioapic_set_affinity, - .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, }; |