diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2016-09-23 14:23:43 +0100 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-09-23 16:34:18 +0100 |
commit | 3d9cd95f90b2987ef95182a4340a9150e06c4253 (patch) | |
tree | 9bc50aeb7d0293b8c295139d0bb99094c7c9b500 /virt | |
parent | 6134993789b76d85102d68a286b8b82cb53b52cb (diff) | |
download | linux-stable-3d9cd95f90b2987ef95182a4340a9150e06c4253.tar.gz linux-stable-3d9cd95f90b2987ef95182a4340a9150e06c4253.tar.bz2 linux-stable-3d9cd95f90b2987ef95182a4340a9150e06c4253.zip |
ARM: gic-v3: Work around definition of gic_write_bpr1
A new accessor for gic_write_bpr1 is added to arch_gicv3.h in 4.9,
whilst the CP15 accessors are redifined in a separate branch.
This leads to a horrible clash, where the new accessor ends up with
a crap "asm volatile" definition.
Work around this by carrying our own definition of gic_write_bpr1,
creating a small conflict which will be obvious to resolve.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions