From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
commit aa8e73eed7d3084c18dd16d195748661c7e881b5 upstream.
This missed the big asm update due to being merged through the crypto
tree.
Fixes: f94909ceb1ed ("x86: Prepare asm files for straight-line-speculation")
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/crypto/sm3-avx-asm_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/crypto/sm3-avx-asm_64.S b/arch/x86/crypto/sm3-avx-asm_64.S
index 71e6aae23e17..b12b9efb5ec5 100644
--- a/arch/x86/crypto/sm3-avx-asm_64.S
+++ b/arch/x86/crypto/sm3-avx-asm_64.S
@@ -513,5 +513,5 @@ SYM_FUNC_START(sm3_transform_avx)
movq %rbp, %rsp;
popq %rbp;
- ret;
+ RET;
SYM_FUNC_END(sm3_transform_avx)
--
2.35.1
Patches currently in stable-queue which might be from peterz@xxxxxxxxxxxxx are
queue-5.16/perf-x86-intel-pt-fix-address-filter-config-for-32-b.patch
queue-5.16/locking-lockdep-avoid-potential-access-of-invalid-memory-in-lock_class.patch
queue-5.16/atomics-fix-atomic64_-read_acquire-set_release-fallb.patch
queue-5.16/perf-core-fix-address-filter-parser-for-multiple-fil.patch
queue-5.16/sched-tracing-don-t-re-read-p-state-when-emitting-sc.patch
queue-5.16/sched-tracing-report-task_rtlock_wait-tasks-as-task_.patch
queue-5.16/sched-debug-remove-mpol_get-put-and-task_lock-unlock.patch
queue-5.16/sched-rt-plug-rt_mutex_setprio-vs-push_rt_task-race.patch
queue-5.16/sched-fair-improve-consistency-of-allowed-numa-balan.patch
queue-5.16/locking-lockdep-iterate-lock_classes-directly-when-r.patch
queue-5.16/sched-cpuacct-fix-charge-percpu-cpuusage.patch
queue-5.16/sched-uclamp-fix-iowait-boost-escaping-uclamp-restri.patch
queue-5.16/crypto-x86-sm3-fixup-sls.patch
queue-5.16/rseq-remove-broken-uapi-field-layout-on-32-bit-littl.patch
queue-5.16/sched-core-export-pelt_thermal_tp.patch
