summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-09-29 08:37:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-09-29 08:37:03 -0700
commite7ebdb5161bcb98cb27b7490459419e38dee5b9a (patch)
treede17889517bd5d964162e129d6f700782184b3bd
parent3efc57369a0ce8f76bf0804f7e673982384e4ac9 (diff)
parent4b721fcc094e9eb6dd4702df8d79ab11e120833d (diff)
Merge tag 'linux_kselftest-next-6.12-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fix from Shuah Khan: "One urgent fix to vDSO as automated testing is failing due to this bug" * tag 'linux_kselftest-next-6.12-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests: vDSO: align stack for O2-optimized memcpy
-rw-r--r--tools/testing/selftests/vDSO/vdso_standalone_test_x86.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
index 27f6fdf11969..644915862af8 100644
--- a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
+++ b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
@@ -131,6 +131,8 @@ asm (
"_start:\n\t"
#ifdef __x86_64__
"mov %rsp,%rdi\n\t"
+ "and $-16,%rsp\n\t"
+ "sub $8,%rsp\n\t"
"jmp c_main"
#else
"push %esp\n\t"