aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/asm-prototypes.h
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2020-10-07 18:06:05 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2020-10-08 12:50:52 +1100
commit792254a77201453d9a77479e63dc216ad90462d2 (patch)
tree705bc1471240d76c54be84a457c51fb18e9439ff /arch/powerpc/include/asm/asm-prototypes.h
parentpowerpc/hv-gpci: Add sysfs files inside hv-gpci device to show cpumask (diff)
downloadlinux-dev-792254a77201453d9a77479e63dc216ad90462d2.tar.xz
linux-dev-792254a77201453d9a77479e63dc216ad90462d2.zip
powerpc/security: Fix link stack flush instruction
The inline execution path for the hardware assisted branch flush instruction failed to set CTR to the correct value before bcctr, causing a crash when the feature is enabled. Fixes: 4d24e21cc694 ("powerpc/security: Allow for processors that flush the link stack using the special bcctr") Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20201007080605.64423-1-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc/include/asm/asm-prototypes.h')
-rw-r--r--arch/powerpc/include/asm/asm-prototypes.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h
index 4957119604c7..d0b832cbbec8 100644
--- a/arch/powerpc/include/asm/asm-prototypes.h
+++ b/arch/powerpc/include/asm/asm-prototypes.h
@@ -145,7 +145,9 @@ void _kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);
void _kvmppc_save_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);
/* Patch sites */
-extern s32 patch__call_flush_branch_caches;
+extern s32 patch__call_flush_branch_caches1;
+extern s32 patch__call_flush_branch_caches2;
+extern s32 patch__call_flush_branch_caches3;
extern s32 patch__flush_count_cache_return;
extern s32 patch__flush_link_stack_return;
extern s32 patch__call_kvm_flush_link_stack;