diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 17:03:10 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 17:03:10 -0400 |
| commit | 8430fe66152202e67ec17446908b702f8ecc8383 (patch) | |
| tree | c8ad715d4efb8a2a5447ddfe651b762498535225 | |
| parent | f739992805560c8ff59d89aca9287ba0b9df3e4c (diff) | |
| download | longterm-queue-4.12-8430fe66152202e67ec17446908b702f8ecc8383.tar.gz | |
arm64: trivial refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm64-KVM-Add-HYP-per-cpu-accessors.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/arm64-KVM-Add-HYP-per-cpu-accessors.patch b/queue/arm64-KVM-Add-HYP-per-cpu-accessors.patch index 5856d43..ecab9fe 100644 --- a/queue/arm64-KVM-Add-HYP-per-cpu-accessors.patch +++ b/queue/arm64-KVM-Add-HYP-per-cpu-accessors.patch @@ -1,4 +1,4 @@ -From 85478bab409171de501b719971fd25a3d5d639f9 Mon Sep 17 00:00:00 2001 +From 91a7da50b5b5b80221758730aae239de1f1ca7fe Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Tue, 29 May 2018 13:11:15 +0100 Subject: [PATCH] arm64: KVM: Add HYP per-cpu accessors @@ -14,14 +14,15 @@ Reviewed-by: Christoffer Dall <christoffer.dall@arm.com> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h -index f6648a3e4152..fefd8cf42c35 100644 +index 1ed5cb9c322c..b956418f73bd 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h -@@ -71,14 +71,37 @@ extern u32 __kvm_get_mdcr_el2(void); +@@ -69,14 +69,37 @@ extern u32 __init_stage2_translation(void); - extern u32 __init_stage2_translation(void); + extern void __qcom_hyp_sanitize_btac_predictors(void); +/* Home-grown __this_cpu_{ptr,read} variants that always work at HYP */ +#define __hyp_this_cpu_ptr(sym) \ |