aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-09-02 09:07:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-09-02 09:07:27 -0700
commitfdde6187804782dce49c78d00e04bac6535628c7 (patch)
tree6f6dab160ad65406023620f064f72c8ab7a98f57
parenta6216978de56138404e7fd61563f0f199eebf22a (diff)
parent6ea7bb00c1ba180f8bf8320b8d59b532501c5271 (diff)
downloadlinux-fdde6187804782dce49c78d00e04bac6535628c7.tar.gz
Merge tag 'x86-urgent-2023-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 selftest fix from Ingo Molnar: "Fix the __NR_map_shadow_stack syscall-renumbering fallout in the x86 self-test code. [ Arguably the existing code was unnecessarily fragile, and tooling should have picked up the new syscall number, and a wider fix is being worked on - but meanwhile, let's not have the old syscall number in the kernel tree. ]" * tag 'x86-urgent-2023-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: selftests/x86: Update map_shadow_stack syscall nr
-rw-r--r--tools/testing/selftests/x86/test_shadow_stack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/x86/test_shadow_stack.c b/tools/testing/selftests/x86/test_shadow_stack.c
index 2188968674cb11..757e6527f67e2a 100644
--- a/tools/testing/selftests/x86/test_shadow_stack.c
+++ b/tools/testing/selftests/x86/test_shadow_stack.c
@@ -40,7 +40,7 @@
* without building the headers.
*/
#ifndef __NR_map_shadow_stack
-#define __NR_map_shadow_stack 452
+#define __NR_map_shadow_stack 453
#define SHADOW_STACK_SET_TOKEN (1ULL << 0)