diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-02-08 15:54:03 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-02-08 15:54:03 +0100 |
| commit | 2f86e45a7f427d217f4b94603a9f43a14877e2cc (patch) | |
| tree | e4ee4d9fbd95e000873ae16473bcc0123c04d266 /include | |
| parent | f9f21cea311340f38074ff93a8d89b4a9cae6bcc (diff) | |
| parent | 5186a6cc3ef5a3fa327c258924ef098b0de77006 (diff) | |
| download | linux-2f86e45a7f427d217f4b94603a9f43a14877e2cc.tar.bz2 | |
Merge tag 'irqchip-fixes-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes for 5.6, take #1 from Marc Zyngier:
- Guarantee allocation of L2 vPE table for GICv4.1
- Fix GICv4.1 VPROPBASER programming
- Numerous GICv4.1 tidy ups
- Fix disabled GICv3 redistributor provisioning with ACPI
- KConfig cleanup for C-SKY
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/arm-gic-v3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index f0b8ca766e7d..83439bfb6c5b 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -652,10 +652,10 @@ struct rdists { struct { void __iomem *rd_base; struct page *pend_page; - struct page *vpe_l1_page; phys_addr_t phys_base; bool lpi_enabled; cpumask_t *vpe_table_mask; + void *vpe_l1_base; } __percpu *rdist; phys_addr_t prop_table_pa; void *prop_table_va; |