projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6134993) | patch
ARM: gic-v3: Work around definition of gic_write_bpr1
authorMarc Zyngier <marc.zyngier@arm.com>
Fri, 23 Sep 2016 13:23:43 +0000 (14:23 +0100)
committerMarc Zyngier <marc.zyngier@arm.com>
Fri, 23 Sep 2016 15:34:18 +0000 (16:34 +0100)
commit3d9cd95f90b2987ef95182a4340a9150e06c4253
tree9bc50aeb7d0293b8c295139d0bb99094c7c9b500tree | snapshot
parent6134993789b76d85102d68a286b8b82cb53b52cbcommit | diff
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>
arch/arm/include/asm/arch_gicv3.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.