summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/arch_gicv3.h
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-02-28 11:46:59 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2020-02-28 11:50:06 +0100
commite951445f4d3b5d0df69c0c5d18ab1e9058c20e52 (patch)
tree173541185ed04ca711273da2cb2ebd89dcf75753 /arch/arm64/include/asm/arch_gicv3.h
parentef935c25fd648a17c27af5d1738b1884f78c5b75 (diff)
parente43f1331e2ef913b8c566920c9af75e0ccdd1d3f (diff)
downloadlinux-e951445f4d3b5d0df69c0c5d18ab1e9058c20e52.tar.bz2
Merge tag 'kvmarm-fixes-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm fixes for 5.6, take #1 - Fix compilation on 32bit - Move VHE guest entry/exit into the VHE-specific entry code - Make sure all functions called by the non-VHE HYP code is tagged as __always_inline
Diffstat (limited to 'arch/arm64/include/asm/arch_gicv3.h')
-rw-r--r--arch/arm64/include/asm/arch_gicv3.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h
index 25fec4bde43a..a358e97572c1 100644
--- a/arch/arm64/include/asm/arch_gicv3.h
+++ b/arch/arm64/include/asm/arch_gicv3.h
@@ -32,7 +32,7 @@ static inline void gic_write_eoir(u32 irq)
isb();
}
-static inline void gic_write_dir(u32 irq)
+static __always_inline void gic_write_dir(u32 irq)
{
write_sysreg_s(irq, SYS_ICC_DIR_EL1);
isb();