Commit e7ebdb51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-next-6.12-rc1-fixes' of... 

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
parents 3efc5736 4b721fcc

tools/testing/selftests/vDSO/vdso_standalone_test_x86.c

+2 −0
Original line number Diff line number Diff line
@@ -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"