Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm / include / asm / arch_gicv3.h

diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
index 1fee657..a808829 100644 (file)
--- a/arch/arm/include/asm/arch_gicv3.h
+++ b/arch/arm/include/asm/arch_gicv3.h
@@ -32,6 +32,7 @@
 #define ICC_CTLR                       __ACCESS_CP15(c12, 0, c12, 4)
 #define ICC_SRE                                __ACCESS_CP15(c12, 0, c12, 5)
 #define ICC_IGRPEN1                    __ACCESS_CP15(c12, 0, c12, 7)
+#define ICC_BPR1                       __ACCESS_CP15(c12, 0, c12, 3)
 
 #define ICC_HSRE                       __ACCESS_CP15(c12, 4, c9, 5)
 
@@ -218,11 +219,7 @@ static inline void gic_write_sre(u32 val)
 
 static inline void gic_write_bpr1(u32 val)
 {
-#if defined(__write_sysreg) && defined(ICC_BPR1)
        write_sysreg(val, ICC_BPR1);
-#else
-       asm volatile("mcr " __stringify(ICC_BPR1) : : "r" (val));
-#endif
 }
 
 /*