diff options
| author | Thomas Gleixner | 2017-10-16 10:26:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2017-10-16 10:26:46 +0200 |
| commit | 3d51969ce318963e5330bda74dcfac22da180c71 (patch) | |
| tree | d6a12a35eb4c30b3d7800e2bec274914b6ccf3a3 /include/linux/irq.h | |
| parent | Linux 4.14-rc5 (diff) | |
| parent | genirq: generic chip: remove irq_gc_mask_disable_reg_and_ack() (diff) | |
| download | kernel-qcow2-linux-3d51969ce318963e5330bda74dcfac22da180c71.tar.gz kernel-qcow2-linux-3d51969ce318963e5330bda74dcfac22da180c71.tar.xz kernel-qcow2-linux-3d51969ce318963e5330bda74dcfac22da180c71.zip | |
Merge tag 'irqchip-4.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip updates for 4.14-rc5 from Marc Zyngier:
- Fix unfortunate mistake in the GICv3 ITS binding example
- Two fixes for the recently merged GICv4 support
- GICv3 ITS 52bit PA fixes
- Generic irqchip mask-ack fix, and its application to the tango irqchip
Diffstat (limited to 'include/linux/irq.h')
| -rw-r--r-- | include/linux/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index d4728bf6a537..5ad10948ea95 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -1009,7 +1009,7 @@ void irq_gc_mask_clr_bit(struct irq_data *d); void irq_gc_unmask_enable_reg(struct irq_data *d); void irq_gc_ack_set_bit(struct irq_data *d); void irq_gc_ack_clr_bit(struct irq_data *d); -void irq_gc_mask_disable_reg_and_ack(struct irq_data *d); +void irq_gc_mask_disable_and_ack_set(struct irq_data *d); void irq_gc_eoi(struct irq_data *d); int irq_gc_set_wake(struct irq_data *d, unsigned int on); |