diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:45:01 -0700 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:45:01 -0700 |
commit | 1cfb9d628fa24c0a8b24cd604ae62dfa10a0d716 (patch) | |
tree | 4e57e7465ce5fbc2a6cc838fd78e5e8a2b9799ff /arch/x86/kernel/apic/io_apic.c | |
parent | d595150285cf886cf2399fd74b0eeb43b444c706 (diff) | |
parent | 7ecc9777c5c76d7b31c376ffd4f59c4a85472a1b (diff) |
Merge branch 'linux-linaro-lsk-v4.9' into v4.9/topic/ionv4.9/topic/ion
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 7249f1500bcb..cf89928dbd46 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -2116,7 +2116,7 @@ static inline void __init check_timer(void) int idx; idx = find_irq_entry(apic1, pin1, mp_INT); if (idx != -1 && irq_trigger(idx)) - unmask_ioapic_irq(irq_get_chip_data(0)); + unmask_ioapic_irq(irq_get_irq_data(0)); } irq_domain_deactivate_irq(irq_data); irq_domain_activate_irq(irq_data); |