Commit 189b7562 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'seccomp-v6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull seccomp fix from Kees Cook:

 - Fix seccomp_unotify perf benchmark for 32-bit (Jiri Slaby)

* tag 'seccomp-v6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  perf/benchmark: fix seccomp_unotify benchmark for 32-bit
parents ea1cc20c 31c65705
......@@ -26,6 +26,6 @@
#ifndef __NR_setns
#define __NR_setns 346
#endif
#ifdef __NR_seccomp
#ifndef __NR_seccomp
#define __NR_seccomp 354
#endif
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