Commit fdde6187 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a6216978 6ea7bb00
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* without building the headers. * without building the headers.
*/ */
#ifndef __NR_map_shadow_stack #ifndef __NR_map_shadow_stack
#define __NR_map_shadow_stack 452 #define __NR_map_shadow_stack 453
#define SHADOW_STACK_SET_TOKEN (1ULL << 0) #define SHADOW_STACK_SET_TOKEN (1ULL << 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment