summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJulien Thierry <julien.thierry@arm.com>2017-10-20 11:34:17 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-08 09:08:32 (GMT)
commite059fc3c36c01cf7c67e3177132e18d16278630a (patch)
treec6bfdd31fdb3e1bbe498de419f813beeba68dbdd /arch/arm
parentd7d5a30e23a2e10210ec9cd92ea64af6649557be (diff)
downloadlinux-e059fc3c36c01cf7c67e3177132e18d16278630a.tar.xz
arm/arm64: kvm: Disable branch profiling in HYP code
commit f9b269f3098121b5d54aaf822e0898c8ed1d3fec upstream. When HYP code runs into branch profiling code, it attempts to jump to unmapped memory, causing a HYP Panic. Disable the branch profiling for code designed to run at HYP mode. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Cc: Christoffer Dall <christoffer.dall@linaro.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Russell King <linux@armlinux.org.uk> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kvm/hyp/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/hyp/Makefile b/arch/arm/kvm/hyp/Makefile
index 8679405..92eab1d 100644
--- a/arch/arm/kvm/hyp/Makefile
+++ b/arch/arm/kvm/hyp/Makefile
@@ -2,7 +2,7 @@
# Makefile for Kernel-based Virtual Machine module, HYP part
#
-ccflags-y += -fno-stack-protector
+ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING
KVM=../../../../virt/kvm