diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:44:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:44:54 +0200 |
| commit | 9ca12e50a48c100e3bda3e5152d2181f4a6649e2 (patch) | |
| tree | ab7fefdcb6fed2fe25a7a256e1fcaea5c5f2dd11 /include/uapi | |
| parent | cxl: Use of_property_ accessor functions (diff) | |
| parent | Linux 6.11-rc3 (diff) | |
| download | linux-9ca12e50a48c100e3bda3e5152d2181f4a6649e2.tar.xz linux-9ca12e50a48c100e3bda3e5152d2181f4a6649e2.zip | |
Merge 6.11-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/asm-generic/unistd.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 985a262d0f9e..5bf6148cac2b 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -841,11 +841,8 @@ __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules) #define __NR_mseal 462 __SYSCALL(__NR_mseal, sys_mseal) -#define __NR_uretprobe 463 -__SYSCALL(__NR_uretprobe, sys_uretprobe) - #undef __NR_syscalls -#define __NR_syscalls 464 +#define __NR_syscalls 463 /* * 32 bit systems traditionally used different |