deduplicate __NR_* and SYS_* syscall number definitions

17 files changed, 890 insertions, 5284 deletions

diff --git a/Makefile b/Makefile
index ec54880d..8246b78f 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ CRT_OBJS = $(filter obj/crt/%,$(ALL_OBJS))
 
 AOBJS = $(LIBC_OBJS)
 LOBJS = $(LIBC_OBJS:.o=.lo)
-GENH = obj/include/bits/alltypes.h
+GENH = obj/include/bits/alltypes.h obj/include/bits/syscall.h
 GENH_INT = obj/src/internal/version.h
 IMPH = $(addprefix $(srcdir)/, src/internal/stdio_impl.h src/internal/pthread_impl.h src/internal/libc.h)
 
@@ -96,6 +96,10 @@ $(OBJ_DIRS):
 obj/include/bits/alltypes.h: $(srcdir)/arch/$(ARCH)/bits/alltypes.h.in $(srcdir)/include/alltypes.h.in $(srcdir)/tools/mkalltypes.sed
 	sed -f $(srcdir)/tools/mkalltypes.sed $(srcdir)/arch/$(ARCH)/bits/alltypes.h.in $(srcdir)/include/alltypes.h.in > $@
 
+obj/include/bits/syscall.h: $(srcdir)/arch/$(ARCH)/bits/syscall.h.in
+	cp $< $@
+	sed -n -e s/__NR_/SYS_/p < $< >> $@
+
 obj/src/internal/version.h: $(wildcard $(srcdir)/VERSION $(srcdir)/.git)
 	printf '#define VERSION "%s"\n' "$$(cd $(srcdir); sh tools/version.sh)" > $@
 
diff --git a/arch/aarch64/bits/syscall.h b/arch/aarch64/bits/syscall.h
deleted file mode 100644
index eddbe929..00000000
--- a/arch/aarch64/bits/syscall.h
+++ /dev/null
@@ -1,543 +0,0 @@
-#define __NR_io_setup 0
-#define __NR_io_destroy 1
-#define __NR_io_submit 2
-#define __NR_io_cancel 3
-#define __NR_io_getevents 4
-#define __NR_setxattr 5
-#define __NR_lsetxattr 6
-#define __NR_fsetxattr 7
-#define __NR_getxattr 8
-#define __NR_lgetxattr 9
-#define __NR_fgetxattr 10
-#define __NR_listxattr 11
-#define __NR_llistxattr 12
-#define __NR_flistxattr 13
-#define __NR_removexattr 14
-#define __NR_lremovexattr 15
-#define __NR_fremovexattr 16
-#define __NR_getcwd 17
-#define __NR_lookup_dcookie 18
-#define __NR_eventfd2 19
-#define __NR_epoll_create1 20
-#define __NR_epoll_ctl 21
-#define __NR_epoll_pwait 22
-#define __NR_dup 23
-#define __NR_dup3 24
-#define __NR_fcntl 25
-#define __NR_inotify_init1 26
-#define __NR_inotify_add_watch 27
-#define __NR_inotify_rm_watch 28
-#define __NR_ioctl 29
-#define __NR_ioprio_set 30
-#define __NR_ioprio_get 31
-#define __NR_flock 32
-#define __NR_mknodat 33
-#define __NR_mkdirat 34
-#define __NR_unlinkat 35
-#define __NR_symlinkat 36
-#define __NR_linkat 37
-#define __NR_renameat 38
-#define __NR_umount2 39
-#define __NR_mount 40
-#define __NR_pivot_root 41
-#define __NR_nfsservctl 42
-#define __NR_statfs 43
-#define __NR_fstatfs 44
-#define __NR_truncate 45
-#define __NR_ftruncate 46
-#define __NR_fallocate 47
-#define __NR_faccessat 48
-#define __NR_chdir 49
-#define __NR_fchdir 50
-#define __NR_chroot 51
-#define __NR_fchmod 52
-#define __NR_fchmodat 53
-#define __NR_fchownat 54
-#define __NR_fchown 55
-#define __NR_openat 56
-#define __NR_close 57
-#define __NR_vhangup 58
-#define __NR_pipe2 59
-#define __NR_quotactl 60
-#define __NR_getdents64 61
-#define __NR_lseek 62
-#define __NR_read 63
-#define __NR_write 64
-#define __NR_readv 65
-#define __NR_writev 66
-#define __NR_pread64 67
-#define __NR_pwrite64 68
-#define __NR_preadv 69
-#define __NR_pwritev 70
-#define __NR_sendfile 71
-#define __NR_pselect6 72
-#define __NR_ppoll 73
-#define __NR_signalfd4 74
-#define __NR_vmsplice 75
-#define __NR_splice 76
-#define __NR_tee 77
-#define __NR_readlinkat 78
-#define __NR_fstatat 79
-#define __NR_fstat 80
-#define __NR_sync 81
-#define __NR_fsync 82
-#define __NR_fdatasync 83
-#define __NR_sync_file_range 84
-#define __NR_timerfd_create 85
-#define __NR_timerfd_settime 86
-#define __NR_timerfd_gettime 87
-#define __NR_utimensat 88
-#define __NR_acct 89
-#define __NR_capget 90
-#define __NR_capset 91
-#define __NR_personality 92
-#define __NR_exit 93
-#define __NR_exit_group 94
-#define __NR_waitid 95
-#define __NR_set_tid_address 96
-#define __NR_unshare 97
-#define __NR_futex 98
-#define __NR_set_robust_list 99
-#define __NR_get_robust_list 100
-#define __NR_nanosleep 101
-#define __NR_getitimer 102
-#define __NR_setitimer 103
-#define __NR_kexec_load 104
-#define __NR_init_module 105
-#define __NR_delete_module 106
-#define __NR_timer_create 107
-#define __NR_timer_gettime 108
-#define __NR_timer_getoverrun 109
-#define __NR_timer_settime 110
-#define __NR_timer_delete 111
-#define __NR_clock_settime 112
-#define __NR_clock_gettime 113
-#define __NR_clock_getres 114
-#define __NR_clock_nanosleep 115
-#define __NR_syslog 116
-#define __NR_ptrace 117
-#define __NR_sched_setparam 118
-#define __NR_sched_setscheduler 119
-#define __NR_sched_getscheduler 120
-#define __NR_sched_getparam 121
-#define __NR_sched_setaffinity 122
-#define __NR_sched_getaffinity 123
-#define __NR_sched_yield 124
-#define __NR_sched_get_priority_max 125
-#define __NR_sched_get_priority_min 126
-#define __NR_sched_rr_get_interval 127
-#define __NR_restart_syscall 128
-#define __NR_kill 129
-#define __NR_tkill 130
-#define __NR_tgkill 131
-#define __NR_sigaltstack 132
-#define __NR_rt_sigsuspend 133
-#define __NR_rt_sigaction 134
-#define __NR_rt_sigprocmask 135
-#define __NR_rt_sigpending 136
-#define __NR_rt_sigtimedwait 137
-#define __NR_rt_sigqueueinfo 138
-#define __NR_rt_sigreturn 139
-#define __NR_setpriority 140
-#define __NR_getpriority 141
-#define __NR_reboot 142
-#define __NR_setregid 143
-#define __NR_setgid 144
-#define __NR_setreuid 145
-#define __NR_setuid 146
-#define __NR_setresuid 147
-#define __NR_getresuid 148
-#define __NR_setresgid 149
-#define __NR_getresgid 150
-#define __NR_setfsuid 151
-#define __NR_setfsgid 152
-#define __NR_times 153
-#define __NR_setpgid 154
-#define __NR_getpgid 155
-#define __NR_getsid 156
-#define __NR_setsid 157
-#define __NR_getgroups 158
-#define __NR_setgroups 159
-#define __NR_uname 160
-#define __NR_sethostname 161
-#define __NR_setdomainname 162
-#define __NR_getrlimit 163
-#define __NR_setrlimit 164
-#define __NR_getrusage 165
-#define __NR_umask 166
-#define __NR_prctl 167
-#define __NR_getcpu 168
-#define __NR_gettimeofday 169
-#define __NR_settimeofday 170
-#define __NR_adjtimex 171
-#define __NR_getpid 172
-#define __NR_getppid 173
-#define __NR_getuid 174
-#define __NR_geteuid 175
-#define __NR_getgid 176
-#define __NR_getegid 177
-#define __NR_gettid 178
-#define __NR_sysinfo 179
-#define __NR_mq_open 180
-#define __NR_mq_unlink 181
-#define __NR_mq_timedsend 182
-#define __NR_mq_timedreceive 183
-#define __NR_mq_notify 184
-#define __NR_mq_getsetattr 185
-#define __NR_msgget 186
-#define __NR_msgctl 187
-#define __NR_msgrcv 188
-#define __NR_msgsnd 189
-#define __NR_semget 190
-#define __NR_semctl 191
-#define __NR_semtimedop 192
-#define __NR_semop 193
-#define __NR_shmget 194
-#define __NR_shmctl 195
-#define __NR_shmat 196
-#define __NR_shmdt 197
-#define __NR_socket 198
-#define __NR_socketpair 199
-#define __NR_bind 200
-#define __NR_listen 201
-#define __NR_accept 202
-#define __NR_connect 203
-#define __NR_getsockname 204
-#define __NR_getpeername 205
-#define __NR_sendto 206
-#define __NR_recvfrom 207
-#define __NR_setsockopt 208
-#define __NR_getsockopt 209
-#define __NR_shutdown 210
-#define __NR_sendmsg 211
-#define __NR_recvmsg 212
-#define __NR_readahead 213
-#define __NR_brk 214
-#define __NR_munmap 215
-#define __NR_mremap 216
-#define __NR_add_key 217
-#define __NR_request_key 218
-#define __NR_keyctl 219
-#define __NR_clone 220
-#define __NR_execve 221
-#define __NR_mmap 222
-#define __NR_fadvise64 223
-#define __NR_swapon 224
-#define __NR_swapoff 225
-#define __NR_mprotect 226
-#define __NR_msync 227
-#define __NR_mlock 228
-#define __NR_munlock 229
-#define __NR_mlockall 230
-#define __NR_munlockall 231
-#define __NR_mincore 232
-#define __NR_madvise 233
-#define __NR_remap_file_pages 234
-#define __NR_mbind 235
-#define __NR_get_mempolicy 236
-#define __NR_set_mempolicy 237
-#define __NR_migrate_pages 238
-#define __NR_move_pages 239
-#define __NR_rt_tgsigqueueinfo 240
-#define __NR_perf_event_open 241
-#define __NR_accept4 242
-#define __NR_recvmmsg 243
-#define __NR_or1k_atomic 244
-#define __NR_wait4 260
-#define __NR_prlimit64 261
-#define __NR_fanotify_init 262
-#define __NR_fanotify_mark 263
-#define __NR_name_to_handle_at 264
-#define __NR_open_by_handle_at 265
-#define __NR_clock_adjtime 266
-#define __NR_syncfs 267
-#define __NR_setns 268
-#define __NR_sendmmsg 269
-#define __NR_process_vm_readv 270
-#define __NR_process_vm_writev 271
-#define __NR_kcmp 272
-#define __NR_finit_module 273
-#define __NR_sched_setattr 274
-#define __NR_sched_getattr 275
-#define __NR_renameat2 276
-#define __NR_seccomp 277
-#define __NR_getrandom 278
-#define __NR_memfd_create 279
-#define __NR_bpf 280
-#define __NR_execveat 281
-#define __NR_userfaultfd 282
-#define __NR_membarrier 283
-#define __NR_mlock2 284
-#define __NR_copy_file_range 285
-
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_submit __NR_io_submit
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_setxattr __NR_setxattr
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_getxattr __NR_getxattr
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_removexattr __NR_removexattr
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_getcwd __NR_getcwd
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_dup __NR_dup
-#define SYS_dup3 __NR_dup3
-#define SYS_fcntl __NR_fcntl
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_ioctl __NR_ioctl
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_flock __NR_flock
-#define SYS_mknodat __NR_mknodat
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_linkat __NR_linkat
-#define SYS_renameat __NR_renameat
-#define SYS_umount2 __NR_umount2
-#define SYS_mount __NR_mount
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_nfsservctl __NR_nfsservctl
-#define SYS_statfs __NR_statfs
-#define SYS_fstatfs __NR_fstatfs
-#define SYS_truncate __NR_truncate
-#define SYS_ftruncate __NR_ftruncate
-#define SYS_fallocate __NR_fallocate
-#define SYS_faccessat __NR_faccessat
-#define SYS_chdir __NR_chdir
-#define SYS_fchdir __NR_fchdir
-#define SYS_chroot __NR_chroot
-#define SYS_fchmod __NR_fchmod
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_fchownat __NR_fchownat
-#define SYS_fchown __NR_fchown
-#define SYS_openat __NR_openat
-#define SYS_close __NR_close
-#define SYS_vhangup __NR_vhangup
-#define SYS_pipe2 __NR_pipe2
-#define SYS_quotactl __NR_quotactl
-#define SYS_getdents64 __NR_getdents64
-#define SYS_lseek __NR_lseek
-#define SYS_read __NR_read
-#define SYS_write __NR_write
-#define SYS_readv __NR_readv
-#define SYS_writev __NR_writev
-#define SYS_pread64 __NR_pread64
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_preadv __NR_preadv
-#define SYS_pwritev __NR_pwritev
-#define SYS_sendfile __NR_sendfile
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ppoll __NR_ppoll
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_splice __NR_splice
-#define SYS_tee __NR_tee
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_fstatat __NR_fstatat
-#define SYS_fstat __NR_fstat
-#define SYS_sync __NR_sync
-#define SYS_fsync __NR_fsync
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_sync_file_range __NR_sync_file_range
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_utimensat __NR_utimensat
-#define SYS_acct __NR_acct
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_personality __NR_personality
-#define SYS_exit __NR_exit
-#define SYS_exit_group __NR_exit_group
-#define SYS_waitid __NR_waitid
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_unshare __NR_unshare
-#define SYS_futex __NR_futex
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_getitimer __NR_getitimer
-#define SYS_setitimer __NR_setitimer
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_init_module __NR_init_module
-#define SYS_delete_module __NR_delete_module
-#define SYS_timer_create __NR_timer_create
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_syslog __NR_syslog
-#define SYS_ptrace __NR_ptrace
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_kill __NR_kill
-#define SYS_tkill __NR_tkill
-#define SYS_tgkill __NR_tgkill
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_setpriority __NR_setpriority
-#define SYS_getpriority __NR_getpriority
-#define SYS_reboot __NR_reboot
-#define SYS_setregid __NR_setregid
-#define SYS_setgid __NR_setgid
-#define SYS_setreuid __NR_setreuid
-#define SYS_setuid __NR_setuid
-#define SYS_setresuid __NR_setresuid
-#define SYS_getresuid __NR_getresuid
-#define SYS_setresgid __NR_setresgid
-#define SYS_getresgid __NR_getresgid
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_times __NR_times
-#define SYS_setpgid __NR_setpgid
-#define SYS_getpgid __NR_getpgid
-#define SYS_getsid __NR_getsid
-#define SYS_setsid __NR_setsid
-#define SYS_getgroups __NR_getgroups
-#define SYS_setgroups __NR_setgroups
-#define SYS_uname __NR_uname
-#define SYS_sethostname __NR_sethostname
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_getrlimit __NR_getrlimit
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_getrusage __NR_getrusage
-#define SYS_umask __NR_umask
-#define SYS_prctl __NR_prctl
-#define SYS_getcpu __NR_getcpu
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_getpid __NR_getpid
-#define SYS_getppid __NR_getppid
-#define SYS_getuid __NR_getuid
-#define SYS_geteuid __NR_geteuid
-#define SYS_getgid __NR_getgid
-#define SYS_getegid __NR_getegid
-#define SYS_gettid __NR_gettid
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_msgget __NR_msgget
-#define SYS_msgctl __NR_msgctl
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_semget __NR_semget
-#define SYS_semctl __NR_semctl
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_semop __NR_semop
-#define SYS_shmget __NR_shmget
-#define SYS_shmctl __NR_shmctl
-#define SYS_shmat __NR_shmat
-#define SYS_shmdt __NR_shmdt
-#define SYS_socket __NR_socket
-#define SYS_socketpair __NR_socketpair
-#define SYS_bind __NR_bind
-#define SYS_listen __NR_listen
-#define SYS_accept __NR_accept
-#define SYS_connect __NR_connect
-#define SYS_getsockname __NR_getsockname
-#define SYS_getpeername __NR_getpeername
-#define SYS_sendto __NR_sendto
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_shutdown __NR_shutdown
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_readahead __NR_readahead
-#define SYS_brk __NR_brk
-#define SYS_munmap __NR_munmap
-#define SYS_mremap __NR_mremap
-#define SYS_add_key __NR_add_key
-#define SYS_request_key __NR_request_key
-#define SYS_keyctl __NR_keyctl
-#define SYS_clone __NR_clone
-#define SYS_execve __NR_execve
-#define SYS_mmap __NR_mmap
-#define SYS_fadvise64 __NR_fadvise64
-#define SYS_swapon __NR_swapon
-#define SYS_swapoff __NR_swapoff
-#define SYS_mprotect __NR_mprotect
-#define SYS_msync __NR_msync
-#define SYS_mlock __NR_mlock
-#define SYS_munlock __NR_munlock
-#define SYS_mlockall __NR_mlockall
-#define SYS_munlockall __NR_munlockall
-#define SYS_mincore __NR_mincore
-#define SYS_madvise __NR_madvise
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_mbind __NR_mbind
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_migrate_pages __NR_migrate_pages
-#define SYS_move_pages __NR_move_pages
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_accept4 __NR_accept4
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_or1k_atomic __NR_or1k_atomic
-#define SYS_wait4 __NR_wait4
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_syncfs __NR_syncfs
-#define SYS_setns __NR_setns
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_kcmp __NR_kcmp
-#define SYS_finit_module __NR_finit_module
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_renameat2 __NR_renameat2
-#define SYS_seccomp __NR_seccomp
-#define SYS_getrandom __NR_getrandom
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_bpf __NR_bpf
-#define SYS_execveat __NR_execveat
-#define SYS_userfaultfd __NR_userfaultfd
-#define SYS_membarrier __NR_membarrier
-#define SYS_mlock2 __NR_mlock2
-#define SYS_copy_file_range __NR_copy_file_range
diff --git a/arch/aarch64/bits/syscall.h.in b/arch/aarch64/bits/syscall.h.in
new file mode 100644
index 00000000..bcf69d20
--- /dev/null
+++ b/arch/aarch64/bits/syscall.h.in
@@ -0,0 +1,272 @@
+#define __NR_io_setup 0
+#define __NR_io_destroy 1
+#define __NR_io_submit 2
+#define __NR_io_cancel 3
+#define __NR_io_getevents 4
+#define __NR_setxattr 5
+#define __NR_lsetxattr 6
+#define __NR_fsetxattr 7
+#define __NR_getxattr 8
+#define __NR_lgetxattr 9
+#define __NR_fgetxattr 10
+#define __NR_listxattr 11
+#define __NR_llistxattr 12
+#define __NR_flistxattr 13
+#define __NR_removexattr 14
+#define __NR_lremovexattr 15
+#define __NR_fremovexattr 16
+#define __NR_getcwd 17
+#define __NR_lookup_dcookie 18
+#define __NR_eventfd2 19
+#define __NR_epoll_create1 20
+#define __NR_epoll_ctl 21
+#define __NR_epoll_pwait 22
+#define __NR_dup 23
+#define __NR_dup3 24
+#define __NR_fcntl 25
+#define __NR_inotify_init1 26
+#define __NR_inotify_add_watch 27
+#define __NR_inotify_rm_watch 28
+#define __NR_ioctl 29
+#define __NR_ioprio_set 30
+#define __NR_ioprio_get 31
+#define __NR_flock 32
+#define __NR_mknodat 33
+#define __NR_mkdirat 34
+#define __NR_unlinkat 35
+#define __NR_symlinkat 36
+#define __NR_linkat 37
+#define __NR_renameat 38
+#define __NR_umount2 39
+#define __NR_mount 40
+#define __NR_pivot_root 41
+#define __NR_nfsservctl 42
+#define __NR_statfs 43
+#define __NR_fstatfs 44
+#define __NR_truncate 45
+#define __NR_ftruncate 46
+#define __NR_fallocate 47
+#define __NR_faccessat 48
+#define __NR_chdir 49
+#define __NR_fchdir 50
+#define __NR_chroot 51
+#define __NR_fchmod 52
+#define __NR_fchmodat 53
+#define __NR_fchownat 54
+#define __NR_fchown 55
+#define __NR_openat 56
+#define __NR_close 57
+#define __NR_vhangup 58
+#define __NR_pipe2 59
+#define __NR_quotactl 60
+#define __NR_getdents64 61
+#define __NR_lseek 62
+#define __NR_read 63
+#define __NR_write 64
+#define __NR_readv 65
+#define __NR_writev 66
+#define __NR_pread64 67
+#define __NR_pwrite64 68
+#define __NR_preadv 69
+#define __NR_pwritev 70
+#define __NR_sendfile 71
+#define __NR_pselect6 72
+#define __NR_ppoll 73
+#define __NR_signalfd4 74
+#define __NR_vmsplice 75
+#define __NR_splice 76
+#define __NR_tee 77
+#define __NR_readlinkat 78
+#define __NR_fstatat 79
+#define __NR_fstat 80
+#define __NR_sync 81
+#define __NR_fsync 82
+#define __NR_fdatasync 83
+#define __NR_sync_file_range 84
+#define __NR_timerfd_create 85
+#define __NR_timerfd_settime 86
+#define __NR_timerfd_gettime 87
+#define __NR_utimensat 88
+#define __NR_acct 89
+#define __NR_capget 90
+#define __NR_capset 91
+#define __NR_personality 92
+#define __NR_exit 93
+#define __NR_exit_group 94
+#define __NR_waitid 95
+#define __NR_set_tid_address 96
+#define __NR_unshare 97
+#define __NR_futex 98
+#define __NR_set_robust_list 99
+#define __NR_get_robust_list 100
+#define __NR_nanosleep 101
+#define __NR_getitimer 102
+#define __NR_setitimer 103
+#define __NR_kexec_load 104
+#define __NR_init_module 105
+#define __NR_delete_module 106
+#define __NR_timer_create 107
+#define __NR_timer_gettime 108
+#define __NR_timer_getoverrun 109
+#define __NR_timer_settime 110
+#define __NR_timer_delete 111
+#define __NR_clock_settime 112
+#define __NR_clock_gettime 113
+#define __NR_clock_getres 114
+#define __NR_clock_nanosleep 115
+#define __NR_syslog 116
+#define __NR_ptrace 117
+#define __NR_sched_setparam 118
+#define __NR_sched_setscheduler 119
+#define __NR_sched_getscheduler 120
+#define __NR_sched_getparam 121
+#define __NR_sched_setaffinity 122
+#define __NR_sched_getaffinity 123
+#define __NR_sched_yield 124
+#define __NR_sched_get_priority_max 125
+#define __NR_sched_get_priority_min 126
+#define __NR_sched_rr_get_interval 127
+#define __NR_restart_syscall 128
+#define __NR_kill 129
+#define __NR_tkill 130
+#define __NR_tgkill 131
+#define __NR_sigaltstack 132
+#define __NR_rt_sigsuspend 133
+#define __NR_rt_sigaction 134
+#define __NR_rt_sigprocmask 135
+#define __NR_rt_sigpending 136
+#define __NR_rt_sigtimedwait 137
+#define __NR_rt_sigqueueinfo 138
+#define __NR_rt_sigreturn 139
+#define __NR_setpriority 140
+#define __NR_getpriority 141
+#define __NR_reboot 142
+#define __NR_setregid 143
+#define __NR_setgid 144
+#define __NR_setreuid 145
+#define __NR_setuid 146
+#define __NR_setresuid 147
+#define __NR_getresuid 148
+#define __NR_setresgid 149
+#define __NR_getresgid 150
+#define __NR_setfsuid 151
+#define __NR_setfsgid 152
+#define __NR_times 153
+#define __NR_setpgid 154
+#define __NR_getpgid 155
+#define __NR_getsid 156
+#define __NR_setsid 157
+#define __NR_getgroups 158
+#define __NR_setgroups 159
+#define __NR_uname 160
+#define __NR_sethostname 161
+#define __NR_setdomainname 162
+#define __NR_getrlimit 163
+#define __NR_setrlimit 164
+#define __NR_getrusage 165
+#define __NR_umask 166
+#define __NR_prctl 167
+#define __NR_getcpu 168
+#define __NR_gettimeofday 169
+#define __NR_settimeofday 170
+#define __NR_adjtimex 171
+#define __NR_getpid 172
+#define __NR_getppid 173
+#define __NR_getuid 174
+#define __NR_geteuid 175
+#define __NR_getgid 176
+#define __NR_getegid 177
+#define __NR_gettid 178
+#define __NR_sysinfo 179
+#define __NR_mq_open 180
+#define __NR_mq_unlink 181
+#define __NR_mq_timedsend 182
+#define __NR_mq_timedreceive 183
+#define __NR_mq_notify 184
+#define __NR_mq_getsetattr 185
+#define __NR_msgget 186
+#define __NR_msgctl 187
+#define __NR_msgrcv 188
+#define __NR_msgsnd 189
+#define __NR_semget 190
+#define __NR_semctl 191
+#define __NR_semtimedop 192
+#define __NR_semop 193
+#define __NR_shmget 194
+#define __NR_shmctl 195
+#define __NR_shmat 196
+#define __NR_shmdt 197
+#define __NR_socket 198
+#define __NR_socketpair 199
+#define __NR_bind 200
+#define __NR_listen 201
+#define __NR_accept 202
+#define __NR_connect 203
+#define __NR_getsockname 204
+#define __NR_getpeername 205
+#define __NR_sendto 206
+#define __NR_recvfrom 207
+#define __NR_setsockopt 208
+#define __NR_getsockopt 209
+#define __NR_shutdown 210
+#define __NR_sendmsg 211
+#define __NR_recvmsg 212
+#define __NR_readahead 213
+#define __NR_brk 214
+#define __NR_munmap 215
+#define __NR_mremap 216
+#define __NR_add_key 217
+#define __NR_request_key 218
+#define __NR_keyctl 219
+#define __NR_clone 220
+#define __NR_execve 221
+#define __NR_mmap 222
+#define __NR_fadvise64 223
+#define __NR_swapon 224
+#define __NR_swapoff 225
+#define __NR_mprotect 226
+#define __NR_msync 227
+#define __NR_mlock 228
+#define __NR_munlock 229
+#define __NR_mlockall 230
+#define __NR_munlockall 231
+#define __NR_mincore 232
+#define __NR_madvise 233
+#define __NR_remap_file_pages 234
+#define __NR_mbind 235
+#define __NR_get_mempolicy 236
+#define __NR_set_mempolicy 237
+#define __NR_migrate_pages 238
+#define __NR_move_pages 239
+#define __NR_rt_tgsigqueueinfo 240
+#define __NR_perf_event_open 241
+#define __NR_accept4 242
+#define __NR_recvmmsg 243
+#define __NR_or1k_atomic 244
+#define __NR_wait4 260
+#define __NR_prlimit64 261
+#define __NR_fanotify_init 262
+#define __NR_fanotify_mark 263
+#define __NR_name_to_handle_at 264
+#define __NR_open_by_handle_at 265
+#define __NR_clock_adjtime 266
+#define __NR_syncfs 267
+#define __NR_setns 268
+#define __NR_sendmmsg 269
+#define __NR_process_vm_readv 270
+#define __NR_process_vm_writev 271
+#define __NR_kcmp 272
+#define __NR_finit_module 273
+#define __NR_sched_setattr 274
+#define __NR_sched_getattr 275
+#define __NR_renameat2 276
+#define __NR_seccomp 277
+#define __NR_getrandom 278
+#define __NR_memfd_create 279
+#define __NR_bpf 280
+#define __NR_execveat 281
+#define __NR_userfaultfd 282
+#define __NR_membarrier 283
+#define __NR_mlock2 284
+#define __NR_copy_file_range 285
+
diff --git a/arch/arm/bits/syscall.h b/arch/arm/bits/syscall.h.in
index be30be70..143b0a8d 100644
--- a/arch/arm/bits/syscall.h
+++ b/arch/arm/bits/syscall.h.in
@@ -352,352 +352,3 @@
 #define __ARM_NR_usr32		0x0f0004
 #define __ARM_NR_set_tls	0x0f0005
 
-/* Repeated with SYS_ prefix */
-
-#define SYS_restart_syscall	0
-#define SYS_exit	1
-#define SYS_fork	2
-#define SYS_read	3
-#define SYS_write	4
-#define SYS_open	5
-#define SYS_close	6
-#define SYS_creat	8
-#define SYS_link	9
-#define SYS_unlink	10
-#define SYS_execve	11
-#define SYS_chdir	12
-#define SYS_mknod	14
-#define SYS_chmod	15
-#define SYS_lchown	16
-#define SYS_lseek	19
-#define SYS_getpid	20
-#define SYS_mount	21
-#define SYS_setuid	23
-#define SYS_getuid	24
-#define SYS_ptrace	26
-#define SYS_pause	29
-#define SYS_access	33
-#define SYS_nice	34
-#define SYS_sync	36
-#define SYS_kill	37
-#define SYS_rename	38
-#define SYS_mkdir	39
-#define SYS_rmdir	40
-#define SYS_dup	41
-#define SYS_pipe	42
-#define SYS_times	43
-#define SYS_brk	45
-#define SYS_setgid	46
-#define SYS_getgid	47
-#define SYS_geteuid	49
-#define SYS_getegid	50
-#define SYS_acct	51
-#define SYS_umount2	52
-#define SYS_ioctl	54
-#define SYS_fcntl	55
-#define SYS_setpgid	57
-#define SYS_umask	60
-#define SYS_chroot	61
-#define SYS_ustat	62
-#define SYS_dup2	63
-#define SYS_getppid	64
-#define SYS_getpgrp	65
-#define SYS_setsid	66
-#define SYS_sigaction	67
-#define SYS_setreuid	70
-#define SYS_setregid	71
-#define SYS_sigsuspend	72
-#define SYS_sigpending	73
-#define SYS_sethostname	74
-#define SYS_setrlimit	75
-#define SYS_getrusage	77
-#define SYS_gettimeofday	78
-#define SYS_settimeofday	79
-#define SYS_getgroups	80
-#define SYS_setgroups	81
-#define SYS_symlink	83
-#define SYS_readlink	85
-#define SYS_uselib	86
-#define SYS_swapon	87
-#define SYS_reboot	88
-#define SYS_munmap	91
-#define SYS_truncate	92
-#define SYS_ftruncate	93
-#define SYS_fchmod	94
-#define SYS_fchown	95
-#define SYS_getpriority	96
-#define SYS_setpriority	97
-#define SYS_statfs	99
-#define SYS_fstatfs	100
-#define SYS_syslog	103
-#define SYS_setitimer	104
-#define SYS_getitimer	105
-#define SYS_stat	106
-#define SYS_lstat	107
-#define SYS_fstat	108
-#define SYS_vhangup	111
-#define SYS_wait4	114
-#define SYS_swapoff	115
-#define SYS_sysinfo	116
-#define SYS_fsync	118
-#define SYS_sigreturn	119
-#define SYS_clone	120
-#define SYS_setdomainname	121
-#define SYS_uname	122
-#define SYS_adjtimex	124
-#define SYS_mprotect	125
-#define SYS_sigprocmask	126
-#define SYS_init_module	128
-#define SYS_delete_module	129
-#define SYS_quotactl	131
-#define SYS_getpgid	132
-#define SYS_fchdir	133
-#define SYS_bdflush	134
-#define SYS_sysfs	135
-#define SYS_personality	136
-#define SYS_setfsuid	138
-#define SYS_setfsgid	139
-#define SYS__llseek	140
-#define SYS_getdents	141
-#define SYS__newselect	142
-#define SYS_flock	143
-#define SYS_msync	144
-#define SYS_readv	145
-#define SYS_writev	146
-#define SYS_getsid	147
-#define SYS_fdatasync	148
-#define SYS__sysctl	149
-#define SYS_mlock	150
-#define SYS_munlock	151
-#define SYS_mlockall	152
-#define SYS_munlockall	153
-#define SYS_sched_setparam	154
-#define SYS_sched_getparam	155
-#define SYS_sched_setscheduler	156
-#define SYS_sched_getscheduler	157
-#define SYS_sched_yield	158
-#define SYS_sched_get_priority_max	159
-#define SYS_sched_get_priority_min	160
-#define SYS_sched_rr_get_interval	161
-#define SYS_nanosleep	162
-#define SYS_mremap	163
-#define SYS_setresuid	164
-#define SYS_getresuid	165
-#define SYS_poll	168
-#define SYS_nfsservctl	169
-#define SYS_setresgid	170
-#define SYS_getresgid	171
-#define SYS_prctl	172
-#define SYS_rt_sigreturn	173
-#define SYS_rt_sigaction	174
-#define SYS_rt_sigprocmask	175
-#define SYS_rt_sigpending	176
-#define SYS_rt_sigtimedwait	177
-#define SYS_rt_sigqueueinfo	178
-#define SYS_rt_sigsuspend	179
-#define SYS_pread64	180
-#define SYS_pwrite64	181
-#define SYS_chown	182
-#define SYS_getcwd	183
-#define SYS_capget	184
-#define SYS_capset	185
-#define SYS_sigaltstack	186
-#define SYS_sendfile	187
-#define SYS_vfork	190
-#define SYS_ugetrlimit	191
-#define SYS_mmap2	192
-#define SYS_truncate64	193
-#define SYS_ftruncate64	194
-#define SYS_stat64	195
-#define SYS_lstat64	196
-#define SYS_fstat64	197
-#define SYS_lchown32	198
-#define SYS_getuid32	199
-#define SYS_getgid32	200
-#define SYS_geteuid32	201
-#define SYS_getegid32	202
-#define SYS_setreuid32	203
-#define SYS_setregid32	204
-#define SYS_getgroups32	205
-#define SYS_setgroups32	206
-#define SYS_fchown32	207
-#define SYS_setresuid32	208
-#define SYS_getresuid32	209
-#define SYS_setresgid32	210
-#define SYS_getresgid32	211
-#define SYS_chown32	212
-#define SYS_setuid32	213
-#define SYS_setgid32	214
-#define SYS_setfsuid32	215
-#define SYS_setfsgid32	216
-#define SYS_getdents64	217
-#define SYS_pivot_root	218
-#define SYS_mincore	219
-#define SYS_madvise	220
-#define SYS_fcntl64	221
-#define SYS_gettid	224
-#define SYS_readahead	225
-#define SYS_setxattr	226
-#define SYS_lsetxattr	227
-#define SYS_fsetxattr	228
-#define SYS_getxattr	229
-#define SYS_lgetxattr	230
-#define SYS_fgetxattr	231
-#define SYS_listxattr	232
-#define SYS_llistxattr	233
-#define SYS_flistxattr	234
-#define SYS_removexattr	235
-#define SYS_lremovexattr	236
-#define SYS_fremovexattr	237
-#define SYS_tkill	238
-#define SYS_sendfile64	239
-#define SYS_futex	240
-#define SYS_sched_setaffinity	241
-#define SYS_sched_getaffinity	242
-#define SYS_io_setup	243
-#define SYS_io_destroy	244
-#define SYS_io_getevents	245
-#define SYS_io_submit	246
-#define SYS_io_cancel	247
-#define SYS_exit_group	248
-#define SYS_lookup_dcookie	249
-#define SYS_epoll_create	250
-#define SYS_epoll_ctl	251
-#define SYS_epoll_wait	252
-#define SYS_remap_file_pages	253
-#define SYS_set_tid_address	256
-#define SYS_timer_create	257
-#define SYS_timer_settime	258
-#define SYS_timer_gettime	259
-#define SYS_timer_getoverrun	260
-#define SYS_timer_delete	261
-#define SYS_clock_settime	262
-#define SYS_clock_gettime	263
-#define SYS_clock_getres	264
-#define SYS_clock_nanosleep	265
-#define SYS_statfs64	266
-#define SYS_fstatfs64	267
-#define SYS_tgkill	268
-#define SYS_utimes	269
-#define SYS_fadvise64_64	270
-#define SYS_pciconfig_iobase	271
-#define SYS_pciconfig_read	272
-#define SYS_pciconfig_write	273
-#define SYS_mq_open	274
-#define SYS_mq_unlink	275
-#define SYS_mq_timedsend	276
-#define SYS_mq_timedreceive	277
-#define SYS_mq_notify	278
-#define SYS_mq_getsetattr	279
-#define SYS_waitid	280
-#define SYS_socket	281
-#define SYS_bind	282
-#define SYS_connect	283
-#define SYS_listen	284
-#define SYS_accept	285
-#define SYS_getsockname	286
-#define SYS_getpeername	287
-#define SYS_socketpair	288
-#define SYS_send	289
-#define SYS_sendto	290
-#define SYS_recv	291
-#define SYS_recvfrom	292
-#define SYS_shutdown	293
-#define SYS_setsockopt	294
-#define SYS_getsockopt	295
-#define SYS_sendmsg	296
-#define SYS_recvmsg	297
-#define SYS_semop	298
-#define SYS_semget	299
-#define SYS_semctl	300
-#define SYS_msgsnd	301
-#define SYS_msgrcv	302
-#define SYS_msgget	303
-#define SYS_msgctl	304
-#define SYS_shmat	305
-#define SYS_shmdt	306
-#define SYS_shmget	307
-#define SYS_shmctl	308
-#define SYS_add_key	309
-#define SYS_request_key	310
-#define SYS_keyctl	311
-#define SYS_semtimedop	312
-#define SYS_vserver	313
-#define SYS_ioprio_set	314
-#define SYS_ioprio_get	315
-#define SYS_inotify_init	316
-#define SYS_inotify_add_watch	317
-#define SYS_inotify_rm_watch	318
-#define SYS_mbind	319
-#define SYS_get_mempolicy	320
-#define SYS_set_mempolicy	321
-#define SYS_openat	322
-#define SYS_mkdirat	323
-#define SYS_mknodat	324
-#define SYS_fchownat	325
-#define SYS_futimesat	326
-#define SYS_fstatat64	327
-#define SYS_unlinkat	328
-#define SYS_renameat	329
-#define SYS_linkat	330
-#define SYS_symlinkat	331
-#define SYS_readlinkat	332
-#define SYS_fchmodat	333
-#define SYS_faccessat	334
-#define SYS_pselect6	335
-#define SYS_ppoll	336
-#define SYS_unshare	337
-#define SYS_set_robust_list	338
-#define SYS_get_robust_list	339
-#define SYS_splice	340
-#define SYS_sync_file_range2	341
-#define SYS_tee	342
-#define SYS_vmsplice	343
-#define SYS_move_pages	344
-#define SYS_getcpu	345
-#define SYS_epoll_pwait	346
-#define SYS_kexec_load	347
-#define SYS_utimensat	348
-#define SYS_signalfd	349
-#define SYS_timerfd_create	350
-#define SYS_eventfd	351
-#define SYS_fallocate	352
-#define SYS_timerfd_settime	353
-#define SYS_timerfd_gettime	354
-#define SYS_signalfd4	355
-#define SYS_eventfd2	356
-#define SYS_epoll_create1	357
-#define SYS_dup3	358
-#define SYS_pipe2	359
-#define SYS_inotify_init1	360
-#define SYS_preadv	361
-#define SYS_pwritev	362
-#define SYS_rt_tgsigqueueinfo	363
-#define SYS_perf_event_open	364
-#define SYS_recvmmsg	365
-#define SYS_accept4	366
-#define SYS_fanotify_init	367
-#define SYS_fanotify_mark	368
-#define SYS_prlimit64	369
-#define SYS_name_to_handle_at	370
-#define SYS_open_by_handle_at	371
-#define SYS_clock_adjtime	372
-#define SYS_syncfs	373
-#define SYS_sendmmsg	374
-#define SYS_setns	375
-#define SYS_process_vm_readv	376
-#define SYS_process_vm_writev	377
-#define SYS_kcmp		378
-#define SYS_finit_module	379
-#define SYS_sched_setattr	380
-#define SYS_sched_getattr	381
-#define SYS_renameat2	382
-#define SYS_seccomp	383
-#define SYS_getrandom	384
-#define SYS_memfd_create	385
-#define SYS_bpf	386
-#define SYS_execveat	387
-#define SYS_userfaultfd	388
-#define SYS_membarrier		389
-#define SYS_mlock2		390
-#define SYS_copy_file_range	391
diff --git a/arch/i386/bits/syscall.h b/arch/i386/bits/syscall.h.in
index 25cd50ab..108fbbce 100644
--- a/arch/i386/bits/syscall.h
+++ b/arch/i386/bits/syscall.h.in
@@ -377,384 +377,3 @@
 #define __NR_mlock2		376
 #define __NR_copy_file_range	377
 
-
-/* Repeated with SYS_ prefix */
-
-#define SYS_restart_syscall      0
-#define SYS_exit		  1
-#define SYS_fork		  2
-#define SYS_read		  3
-#define SYS_write		  4
-#define SYS_open		  5
-#define SYS_close		  6
-#define SYS_waitpid		  7
-#define SYS_creat		  8
-#define SYS_link		  9
-#define SYS_unlink		 10
-#define SYS_execve		 11
-#define SYS_chdir		 12
-#define SYS_time		 13
-#define SYS_mknod		 14
-#define SYS_chmod		 15
-#define SYS_lchown		 16
-#define SYS_break		 17
-#define SYS_oldstat		 18
-#define SYS_lseek		 19
-#define SYS_getpid		 20
-#define SYS_mount		 21
-#define SYS_umount		 22
-#define SYS_setuid		 23
-#define SYS_getuid		 24
-#define SYS_stime		 25
-#define SYS_ptrace		 26
-#define SYS_alarm		 27
-#define SYS_oldfstat		 28
-#define SYS_pause		 29
-#define SYS_utime		 30
-#define SYS_stty		 31
-#define SYS_gtty		 32
-#define SYS_access		 33
-#define SYS_nice		 34
-#define SYS_ftime		 35
-#define SYS_sync		 36
-#define SYS_kill		 37
-#define SYS_rename		 38
-#define SYS_mkdir		 39
-#define SYS_rmdir		 40
-#define SYS_dup		 41
-#define SYS_pipe		 42
-#define SYS_times		 43
-#define SYS_prof		 44
-#define SYS_brk		 45
-#define SYS_setgid		 46
-#define SYS_getgid		 47
-#define SYS_signal		 48
-#define SYS_geteuid		 49
-#define SYS_getegid		 50
-#define SYS_acct		 51
-#define SYS_umount2		 52
-#define SYS_lock		 53
-#define SYS_ioctl		 54
-#define SYS_fcntl		 55
-#define SYS_mpx		 56
-#define SYS_setpgid		 57
-#define SYS_ulimit		 58
-#define SYS_oldolduname	 59
-#define SYS_umask		 60
-#define SYS_chroot		 61
-#define SYS_ustat		 62
-#define SYS_dup2		 63
-#define SYS_getppid		 64
-#define SYS_getpgrp		 65
-#define SYS_setsid		 66
-#define SYS_sigaction		 67
-#define SYS_sgetmask		 68
-#define SYS_ssetmask		 69
-#define SYS_setreuid		 70
-#define SYS_setregid		 71
-#define SYS_sigsuspend		 72
-#define SYS_sigpending		 73
-#define SYS_sethostname	 74
-#define SYS_setrlimit		 75
-#define SYS_getrlimit		 76   /* Back compatible 2Gig limited rlimit */
-#define SYS_getrusage		 77
-#define SYS_gettimeofday	 78
-#define SYS_settimeofday	 79
-#define SYS_getgroups		 80
-#define SYS_setgroups		 81
-#define SYS_select		 82
-#define SYS_symlink		 83
-#define SYS_oldlstat		 84
-#define SYS_readlink		 85
-#define SYS_uselib		 86
-#define SYS_swapon		 87
-#define SYS_reboot		 88
-#define SYS_readdir		 89
-#define SYS_mmap		 90
-#define SYS_munmap		 91
-#define SYS_truncate		 92
-#define SYS_ftruncate		 93
-#define SYS_fchmod		 94
-#define SYS_fchown		 95
-#define SYS_getpriority	 96
-#define SYS_setpriority	 97
-#define SYS_profil		 98
-#define SYS_statfs		99
-#define SYS_fstatfs		100
-#define SYS_ioperm		101
-#define SYS_socketcall		102
-#define SYS_syslog		103
-#define SYS_setitimer		104
-#define SYS_getitimer		105
-#define SYS_stat		106
-#define SYS_lstat		107
-#define SYS_fstat		108
-#define SYS_olduname		109
-#define SYS_iopl		110
-#define SYS_vhangup		111
-#define SYS_idle		112
-#define SYS_vm86old		113
-#define SYS_wait4		114
-#define SYS_swapoff		115
-#define SYS_sysinfo		116
-#define SYS_ipc		117
-#define SYS_fsync		118
-#define SYS_sigreturn		119
-#define SYS_clone		120
-#define SYS_setdomainname	121
-#define SYS_uname		122
-#define SYS_modify_ldt		123
-#define SYS_adjtimex		124
-#define SYS_mprotect		125
-#define SYS_sigprocmask	126
-#define SYS_create_module	127
-#define SYS_init_module	128
-#define SYS_delete_module	129
-#define SYS_get_kernel_syms	130
-#define SYS_quotactl		131
-#define SYS_getpgid		132
-#define SYS_fchdir		133
-#define SYS_bdflush		134
-#define SYS_sysfs		135
-#define SYS_personality	136
-#define SYS_afs_syscall	137
-#define SYS_setfsuid		138
-#define SYS_setfsgid		139
-#define SYS__llseek		140
-#define SYS_getdents		141
-#define SYS__newselect		142
-#define SYS_flock		143
-#define SYS_msync		144
-#define SYS_readv		145
-#define SYS_writev		146
-#define SYS_getsid		147
-#define SYS_fdatasync		148
-#define SYS__sysctl		149
-#define SYS_mlock		150
-#define SYS_munlock		151
-#define SYS_mlockall		152
-#define SYS_munlockall		153
-#define SYS_sched_setparam		154
-#define SYS_sched_getparam		155
-#define SYS_sched_setscheduler		156
-#define SYS_sched_getscheduler		157
-#define SYS_sched_yield		158
-#define SYS_sched_get_priority_max	159
-#define SYS_sched_get_priority_min	160
-#define SYS_sched_rr_get_interval	161
-#define SYS_nanosleep		162
-#define SYS_mremap		163
-#define SYS_setresuid		164
-#define SYS_getresuid		165
-#define SYS_vm86		166
-#define SYS_query_module	167
-#define SYS_poll		168
-#define SYS_nfsservctl		169
-#define SYS_setresgid		170
-#define SYS_getresgid		171
-#define SYS_prctl              172
-#define SYS_rt_sigreturn	173
-#define SYS_rt_sigaction	174
-#define SYS_rt_sigprocmask	175
-#define SYS_rt_sigpending	176
-#define SYS_rt_sigtimedwait	177
-#define SYS_rt_sigqueueinfo	178
-#define SYS_rt_sigsuspend	179
-#define SYS_pread64		180
-#define SYS_pwrite64		181
-#define SYS_chown		182
-#define SYS_getcwd		183
-#define SYS_capget		184
-#define SYS_capset		185
-#define SYS_sigaltstack	186
-#define SYS_sendfile		187
-#define SYS_getpmsg		188
-#define SYS_putpmsg		189
-#define SYS_vfork		190
-#define SYS_ugetrlimit		191
-#define SYS_mmap2		192
-#define SYS_truncate64		193
-#define SYS_ftruncate64	194
-#define SYS_stat64		195
-#define SYS_lstat64		196
-#define SYS_fstat64		197
-#define SYS_lchown32		198
-#define SYS_getuid32		199
-#define SYS_getgid32		200
-#define SYS_geteuid32		201
-#define SYS_getegid32		202
-#define SYS_setreuid32		203
-#define SYS_setregid32		204
-#define SYS_getgroups32	205
-#define SYS_setgroups32	206
-#define SYS_fchown32		207
-#define SYS_setresuid32	208
-#define SYS_getresuid32	209
-#define SYS_setresgid32	210
-#define SYS_getresgid32	211
-#define SYS_chown32		212
-#define SYS_setuid32		213
-#define SYS_setgid32		214
-#define SYS_setfsuid32		215
-#define SYS_setfsgid32		216
-#define SYS_pivot_root		217
-#define SYS_mincore		218
-#define SYS_madvise		219
-#define SYS_madvise1		219
-#define SYS_getdents64		220
-#define SYS_fcntl64		221
-/* 223 is unused */
-#define SYS_gettid		224
-#define SYS_readahead		225
-#define SYS_setxattr		226
-#define SYS_lsetxattr		227
-#define SYS_fsetxattr		228
-#define SYS_getxattr		229
-#define SYS_lgetxattr		230
-#define SYS_fgetxattr		231
-#define SYS_listxattr		232
-#define SYS_llistxattr		233
-#define SYS_flistxattr		234
-#define SYS_removexattr	235
-#define SYS_lremovexattr	236
-#define SYS_fremovexattr	237
-#define SYS_tkill		238
-#define SYS_sendfile64		239
-#define SYS_futex		240
-#define SYS_sched_setaffinity	241
-#define SYS_sched_getaffinity	242
-#define SYS_set_thread_area	243
-#define SYS_get_thread_area	244
-#define SYS_io_setup		245
-#define SYS_io_destroy		246
-#define SYS_io_getevents	247
-#define SYS_io_submit		248
-#define SYS_io_cancel		249
-#define SYS_fadvise64		250
-/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
-#define SYS_exit_group		252
-#define SYS_lookup_dcookie	253
-#define SYS_epoll_create	254
-#define SYS_epoll_ctl		255
-#define SYS_epoll_wait		256
-#define SYS_remap_file_pages	257
-#define SYS_set_tid_address	258
-#define SYS_timer_create	259
-#define SYS_timer_settime	(SYS_timer_create+1)
-#define SYS_timer_gettime	(SYS_timer_create+2)
-#define SYS_timer_getoverrun	(SYS_timer_create+3)
-#define SYS_timer_delete	(SYS_timer_create+4)
-#define SYS_clock_settime	(SYS_timer_create+5)
-#define SYS_clock_gettime	(SYS_timer_create+6)
-#define SYS_clock_getres	(SYS_timer_create+7)
-#define SYS_clock_nanosleep	(SYS_timer_create+8)
-#define SYS_statfs64		268
-#define SYS_fstatfs64		269
-#define SYS_tgkill		270
-#define SYS_utimes		271
-#define SYS_fadvise64_64	272
-#define SYS_vserver		273
-#define SYS_mbind		274
-#define SYS_get_mempolicy	275
-#define SYS_set_mempolicy	276
-#define SYS_mq_open 		277
-#define SYS_mq_unlink		(SYS_mq_open+1)
-#define SYS_mq_timedsend	(SYS_mq_open+2)
-#define SYS_mq_timedreceive	(SYS_mq_open+3)
-#define SYS_mq_notify		(SYS_mq_open+4)
-#define SYS_mq_getsetattr	(SYS_mq_open+5)
-#define SYS_kexec_load		283
-#define SYS_waitid		284
-/* #define SYS_sys_setaltroot	285 */
-#define SYS_add_key		286
-#define SYS_request_key	287
-#define SYS_keyctl		288
-#define SYS_ioprio_set		289
-#define SYS_ioprio_get		290
-#define SYS_inotify_init	291
-#define SYS_inotify_add_watch	292
-#define SYS_inotify_rm_watch	293
-#define SYS_migrate_pages	294
-#define SYS_openat		295
-#define SYS_mkdirat		296
-#define SYS_mknodat		297
-#define SYS_fchownat		298
-#define SYS_futimesat		299
-#define SYS_fstatat64		300
-#define SYS_unlinkat		301
-#define SYS_renameat		302
-#define SYS_linkat		303
-#define SYS_symlinkat		304
-#define SYS_readlinkat		305
-#define SYS_fchmodat		306
-#define SYS_faccessat		307
-#define SYS_pselect6		308
-#define SYS_ppoll		309
-#define SYS_unshare		310
-#define SYS_set_robust_list	311
-#define SYS_get_robust_list	312
-#define SYS_splice		313
-#define SYS_sync_file_range	314
-#define SYS_tee		315
-#define SYS_vmsplice		316
-#define SYS_move_pages		317
-#define SYS_getcpu		318
-#define SYS_epoll_pwait	319
-#define SYS_utimensat		320
-#define SYS_signalfd		321
-#define SYS_timerfd_create	322
-#define SYS_eventfd		323
-#define SYS_fallocate		324
-#define SYS_timerfd_settime	325
-#define SYS_timerfd_gettime	326
-#define SYS_signalfd4		327
-#define SYS_eventfd2		328
-#define SYS_epoll_create1	329
-#define SYS_dup3		330
-#define SYS_pipe2		331
-#define SYS_inotify_init1	332
-#define SYS_preadv		333
-#define SYS_pwritev		334
-#define SYS_rt_tgsigqueueinfo	335
-#define SYS_perf_event_open	336
-#define SYS_recvmmsg		337
-#define SYS_fanotify_init	338
-#define SYS_fanotify_mark	339
-#define SYS_prlimit64		340
-#define SYS_name_to_handle_at	341
-#define SYS_open_by_handle_at	342
-#define SYS_clock_adjtime	343
-#define SYS_syncfs		344
-#define SYS_sendmmsg		345
-#define SYS_setns		346
-#define SYS_process_vm_readv	347
-#define SYS_process_vm_writev	348
-#define SYS_kcmp		349
-#define SYS_finit_module	350
-#define SYS_sched_setattr	351
-#define SYS_sched_getattr	352
-#define SYS_renameat2		353
-#define SYS_seccomp		354
-#define SYS_getrandom		355
-#define SYS_memfd_create	356
-#define SYS_bpf			357
-#define SYS_execveat		358
-#define SYS_socket		359
-#define SYS_socketpair		360
-#define SYS_bind		361
-#define SYS_connect		362
-#define SYS_listen		363
-#define SYS_accept4		364
-#define SYS_getsockopt		365
-#define SYS_setsockopt		366
-#define SYS_getsockname		367
-#define SYS_getpeername		368
-#define SYS_sendto		369
-#define SYS_sendmsg		370
-#define SYS_recvfrom		371
-#define SYS_recvmsg		372
-#define SYS_shutdown		373
-#define SYS_userfaultfd		374
-#define SYS_membarrier		375
-#define SYS_mlock2		376
-#define SYS_copy_file_range	377
diff --git a/arch/microblaze/bits/syscall.h b/arch/microblaze/bits/syscall.h.in
index e386d73c..0f67f1d9 100644
--- a/arch/microblaze/bits/syscall.h
+++ b/arch/microblaze/bits/syscall.h.in
@@ -384,391 +384,3 @@
 #define __NR_bpf 387
 #define __NR_execveat 388
 
-/* Repeated with SYS_ prefix */
-
-#define SYS_SYSCALL_BASE 0
-#define SYS_restart_syscall 0
-#define SYS_exit 1
-#define SYS_fork 2
-#define SYS_read 3
-#define SYS_write 4
-#define SYS_open 5
-#define SYS_close 6
-#define SYS_waitpid 7
-#define SYS_creat 8
-#define SYS_link 9
-#define SYS_unlink 10
-#define SYS_execve 11
-#define SYS_chdir 12
-#define SYS_time 13
-#define SYS_mknod 14
-#define SYS_chmod 15
-#define SYS_lchown 16
-#define SYS_break 17
-#define SYS_oldstat 18
-#define SYS_lseek 19
-#define SYS_getpid 20
-#define SYS_mount 21
-#define SYS_umount 22
-#define SYS_setuid 23
-#define SYS_getuid 24
-#define SYS_stime 25
-#define SYS_ptrace 26
-#define SYS_alarm 27
-#define SYS_oldfstat 28
-#define SYS_pause 29
-#define SYS_utime 30
-#define SYS_stty 31
-#define SYS_gtty 32
-#define SYS_access 33
-#define SYS_nice 34
-#define SYS_ftime 35
-#define SYS_sync 36
-#define SYS_kill 37
-#define SYS_rename 38
-#define SYS_mkdir 39
-#define SYS_rmdir 40
-#define SYS_dup 41
-#define SYS_pipe 42
-#define SYS_times 43
-#define SYS_prof 44
-#define SYS_brk 45
-#define SYS_setgid 46
-#define SYS_getgid 47
-#define SYS_signal 48
-#define SYS_geteuid 49
-#define SYS_getegid 50
-#define SYS_acct 51
-#define SYS_umount2 52
-#define SYS_lock 53
-#define SYS_ioctl 54
-#define SYS_fcntl 55
-#define SYS_mpx 56
-#define SYS_setpgid 57
-#define SYS_ulimit 58
-#define SYS_oldolduname 59
-#define SYS_umask 60
-#define SYS_chroot 61
-#define SYS_ustat 62
-#define SYS_dup2 63
-#define SYS_getppid 64
-#define SYS_getpgrp 65
-#define SYS_setsid 66
-#define SYS_sigaction 67
-#define SYS_sgetmask 68
-#define SYS_ssetmask 69
-#define SYS_setreuid 70
-#define SYS_setregid 71
-#define SYS_sigsuspend 72
-#define SYS_sigpending 73
-#define SYS_sethostname 74
-#define SYS_setrlimit 75
-#define SYS_getrlimit 76
-#define SYS_getrusage 77
-#define SYS_gettimeofday 78
-#define SYS_settimeofday 79
-#define SYS_getgroups 80
-#define SYS_setgroups 81
-#define SYS_select 82
-#define SYS_symlink 83
-#define SYS_oldlstat 84
-#define SYS_readlink 85
-#define SYS_uselib 86
-#define SYS_swapon 87
-#define SYS_reboot 88
-#define SYS_readdir 89
-#define SYS_mmap 90
-#define SYS_munmap 91
-#define SYS_truncate 92
-#define SYS_ftruncate 93
-#define SYS_fchmod 94
-#define SYS_fchown 95
-#define SYS_getpriority 96
-#define SYS_setpriority 97
-#define SYS_profil 98
-#define SYS_statfs 99
-#define SYS_fstatfs 100
-#define SYS_ioperm 101
-#define SYS_socketcall 102
-#define SYS_syslog 103
-#define SYS_setitimer 104
-#define SYS_getitimer 105
-#define SYS_stat 106
-#define SYS_lstat 107
-#define SYS_fstat 108
-#define SYS_olduname 109
-#define SYS_iopl 110
-#define SYS_vhangup 111
-#define SYS_idle 112
-#define SYS_vm86old 113
-#define SYS_wait4 114
-#define SYS_swapoff 115
-#define SYS_sysinfo 116
-#define SYS_ipc 117
-#define SYS_fsync 118
-#define SYS_sigreturn 119
-#define SYS_clone 120
-#define SYS_setdomainname 121
-#define SYS_uname 122
-#define SYS_modify_ldt 123
-#define SYS_adjtimex 124
-#define SYS_mprotect 125
-#define SYS_sigprocmask 126
-#define SYS_create_module 127
-#define SYS_init_module 128
-#define SYS_delete_module 129
-#define SYS_get_kernel_syms 130
-#define SYS_quotactl 131
-#define SYS_getpgid 132
-#define SYS_fchdir 133
-#define SYS_bdflush 134
-#define SYS_sysfs 135
-#define SYS_personality 136
-#define SYS_afs_syscall 137
-#define SYS_setfsuid 138
-#define SYS_setfsgid 139
-#define SYS__llseek 140
-#define SYS_getdents 141
-#define SYS__newselect 142
-#define SYS_flock 143
-#define SYS_msync 144
-#define SYS_readv 145
-#define SYS_writev 146
-#define SYS_getsid 147
-#define SYS_fdatasync 148
-#define SYS__sysctl 149
-#define SYS_mlock 150
-#define SYS_munlock 151
-#define SYS_mlockall 152
-#define SYS_munlockall 153
-#define SYS_sched_setparam 154
-#define SYS_sched_getparam 155
-#define SYS_sched_setscheduler 156
-#define SYS_sched_getscheduler 157
-#define SYS_sched_yield 158
-#define SYS_sched_get_priority_max 159
-#define SYS_sched_get_priority_min 160
-#define SYS_sched_rr_get_interval 161
-#define SYS_nanosleep 162
-#define SYS_mremap 163
-#define SYS_setresuid 164
-#define SYS_getresuid 165
-#define SYS_vm86 166
-#define SYS_query_module 167
-#define SYS_poll 168
-#define SYS_nfsservctl 169
-#define SYS_setresgid 170
-#define SYS_getresgid 171
-#define SYS_prctl 172
-#define SYS_rt_sigreturn 173
-#define SYS_rt_sigaction 174
-#define SYS_rt_sigprocmask 175
-#define SYS_rt_sigpending 176
-#define SYS_rt_sigtimedwait 177
-#define SYS_rt_sigqueueinfo 178
-#define SYS_rt_sigsuspend 179
-#define SYS_pread 180
-#define SYS_pwrite 181
-#define SYS_chown 182
-#define SYS_getcwd 183
-#define SYS_capget 184
-#define SYS_capset 185
-#define SYS_sigaltstack 186
-#define SYS_sendfile 187
-#define SYS_getpmsg 188
-#define SYS_putpmsg 189
-#define SYS_vfork 190
-#define SYS_ugetrlimit 191
-#define SYS_mmap2 192
-#define SYS_truncate64 193
-#define SYS_ftruncate64 194
-#define SYS_stat64 195
-#define SYS_lstat64 196
-#define SYS_fstat64 197
-#define SYS_lchown32 198
-#define SYS_getuid32 199
-#define SYS_getgid32 200
-#define SYS_geteuid32 201
-#define SYS_getegid32 202
-#define SYS_setreuid32 203
-#define SYS_setregid32 204
-#define SYS_getgroups32 205
-#define SYS_setgroups32 206
-#define SYS_fchown32 207
-#define SYS_setresuid32 208
-#define SYS_getresuid32 209
-#define SYS_setresgid32 210
-#define SYS_getresgid32 211
-#define SYS_chown32 212
-#define SYS_setuid32 213
-#define SYS_setgid32 214
-#define SYS_setfsuid32 215
-#define SYS_setfsgid32 216
-#define SYS_pivot_root 217
-#define SYS_mincore 218
-#define SYS_madvise 219
-#define SYS_getdents64 220
-#define SYS_fcntl64 221
-#define SYS_gettid 224
-#define SYS_readahead 225
-#define SYS_setxattr 226
-#define SYS_lsetxattr 227
-#define SYS_fsetxattr 228
-#define SYS_getxattr 229
-#define SYS_lgetxattr 230
-#define SYS_fgetxattr 231
-#define SYS_listxattr 232
-#define SYS_llistxattr 233
-#define SYS_flistxattr 234
-#define SYS_removexattr 235
-#define SYS_lremovexattr 236
-#define SYS_fremovexattr 237
-#define SYS_tkill 238
-#define SYS_sendfile64 239
-#define SYS_futex 240
-#define SYS_sched_setaffinity 241
-#define SYS_sched_getaffinity 242
-#define SYS_set_thread_area 243
-#define SYS_get_thread_area 244
-#define SYS_io_setup 245
-#define SYS_io_destroy 246
-#define SYS_io_getevents 247
-#define SYS_io_submit 248
-#define SYS_io_cancel 249
-#define SYS_fadvise 250
-#define SYS_exit_group 252
-#define SYS_lookup_dcookie 253
-#define SYS_epoll_create 254
-#define SYS_epoll_ctl 255
-#define SYS_epoll_wait 256
-#define SYS_remap_file_pages 257
-#define SYS_set_tid_address 258
-#define SYS_timer_create 259
-#define SYS_timer_settime 260
-#define SYS_timer_gettime 261
-#define SYS_timer_getoverrun 262
-#define SYS_timer_delete 263
-#define SYS_clock_settime 264
-#define SYS_clock_gettime 265
-#define SYS_clock_getres 266
-#define SYS_clock_nanosleep 267
-#define SYS_statfs64 268
-#define SYS_fstatfs64 269
-#define SYS_tgkill 270
-#define SYS_utimes 271
-#define SYS_fadvise64_64 272
-#define SYS_vserver 273
-#define SYS_mbind 274
-#define SYS_get_mempolicy 275
-#define SYS_set_mempolicy 276
-#define SYS_mq_open 277
-#define SYS_mq_unlink 278
-#define SYS_mq_timedsend 279
-#define SYS_mq_timedreceive 280
-#define SYS_mq_notify 281
-#define SYS_mq_getsetattr 282
-#define SYS_kexec_load 283
-#define SYS_waitid 284
-#define SYS_add_key 286
-#define SYS_request_key 287
-#define SYS_keyctl 288
-#define SYS_ioprio_set 289
-#define SYS_ioprio_get 290
-#define SYS_inotify_init 291
-#define SYS_inotify_add_watch 292
-#define SYS_inotify_rm_watch 293
-#define SYS_migrate_pages 294
-#define SYS_openat 295
-#define SYS_mkdirat 296
-#define SYS_mknodat 297
-#define SYS_fchownat 298
-#define SYS_futimesat 299
-#define SYS_fstatat 300
-#define SYS_unlinkat 301
-#define SYS_renameat 302
-#define SYS_linkat 303
-#define SYS_symlinkat 304
-#define SYS_readlinkat 305
-#define SYS_fchmodat 306
-#define SYS_faccessat 307
-#define SYS_pselect6 308
-#define SYS_ppoll 309
-#define SYS_unshare 310
-#define SYS_set_robust_list 311
-#define SYS_get_robust_list 312
-#define SYS_splice 313
-#define SYS_sync_file_range 314
-#define SYS_tee 315
-#define SYS_vmsplice 316
-#define SYS_move_pages 317
-#define SYS_getcpu 318
-#define SYS_epoll_pwait 319
-#define SYS_utimensat 320
-#define SYS_signalfd 321
-#define SYS_timerfd_create 322
-#define SYS_eventfd 323
-#define SYS_fallocate 324
-#define SYS_semtimedop 325
-#define SYS_timerfd_settime 326
-#define SYS_timerfd_gettime 327
-#define SYS_semctl 328
-#define SYS_semget 329
-#define SYS_semop 330
-#define SYS_msgctl 331
-#define SYS_msgget 332
-#define SYS_msgrcv 333
-#define SYS_msgsnd 334
-#define SYS_shmat 335
-#define SYS_shmctl 336
-#define SYS_shmdt 337
-#define SYS_shmget 338
-#define SYS_signalfd4 339
-#define SYS_eventfd2 340
-#define SYS_epoll_create1 341
-#define SYS_dup3 342
-#define SYS_pipe2 343
-#define SYS_inotify_init1 344
-#define SYS_socket 345
-#define SYS_socketpair 346
-#define SYS_bind 347
-#define SYS_listen 348
-#define SYS_accept 349
-#define SYS_connect 350
-#define SYS_getsockname 351
-#define SYS_getpeername 352
-#define SYS_sendto 353
-#define SYS_send 354
-#define SYS_recvfrom 355
-#define SYS_recv 356
-#define SYS_setsockopt 357
-#define SYS_getsockopt 358
-#define SYS_shutdown 359
-#define SYS_sendmsg 360
-#define SYS_recvmsg 361
-#define SYS_accept4 362
-#define SYS_preadv 363
-#define SYS_pwritev 364
-#define SYS_rt_tgsigqueueinfo 365
-#define SYS_perf_event_open 366
-#define SYS_recvmmsg 367
-#define SYS_fanotify_init 368
-#define SYS_fanotify_mark 369
-#define SYS_prlimit64 370
-#define SYS_name_to_handle_at 371
-#define SYS_open_by_handle_at 372
-#define SYS_clock_adjtime 373
-#define SYS_syncfs 374
-#define SYS_setns 375
-#define SYS_sendmmsg 376
-#define SYS_process_vm_readv 377
-#define SYS_process_vm_writev 378
-#define SYS_kcmp 379
-#define SYS_finit_module 380
-#define SYS_sched_setattr 381
-#define SYS_sched_getattr 382
-#define SYS_renameat2 383
-#define SYS_seccomp 384
-#define SYS_getrandom 385
-#define SYS_memfd_create 386
-#define SYS_bpf 387
-#define SYS_execveat 388
diff --git a/arch/mips/bits/syscall.h b/arch/mips/bits/syscall.h.in
index 40ca6ba1..61ff7a58 100644
--- a/arch/mips/bits/syscall.h
+++ b/arch/mips/bits/syscall.h.in
@@ -359,365 +359,3 @@
 #define __NR_mlock2                  4359
 #define __NR_copy_file_range         4360
 
-
-/* Repeated with SYS_ prefix */
-#define SYS_syscall                 4000
-#define SYS_exit                    4001
-#define SYS_fork                    4002
-#define SYS_read                    4003
-#define SYS_write                   4004
-#define SYS_open                    4005
-#define SYS_close                   4006
-#define SYS_waitpid                 4007
-#define SYS_creat                   4008
-#define SYS_link                    4009
-#define SYS_unlink                  4010
-#define SYS_execve                  4011
-#define SYS_chdir                   4012
-#define SYS_time                    4013
-#define SYS_mknod                   4014
-#define SYS_chmod                   4015
-#define SYS_lchown                  4016
-#define SYS_break                   4017
-#define SYS_unused18                4018
-#define SYS_lseek                   4019
-#define SYS_getpid                  4020
-#define SYS_mount                   4021
-#define SYS_umount                  4022
-#define SYS_setuid                  4023
-#define SYS_getuid                  4024
-#define SYS_stime                   4025
-#define SYS_ptrace                  4026
-#define SYS_alarm                   4027
-#define SYS_unused28                4028
-#define SYS_pause                   4029
-#define SYS_utime                   4030
-#define SYS_stty                    4031
-#define SYS_gtty                    4032
-#define SYS_access                  4033
-#define SYS_nice                    4034
-#define SYS_ftime                   4035
-#define SYS_sync                    4036
-#define SYS_kill                    4037
-#define SYS_rename                  4038
-#define SYS_mkdir                   4039
-#define SYS_rmdir                   4040
-#define SYS_dup                     4041
-#define SYS_pipe                    4042
-#define SYS_times                   4043
-#define SYS_prof                    4044
-#define SYS_brk                     4045
-#define SYS_setgid                  4046
-#define SYS_getgid                  4047
-#define SYS_signal                  4048
-#define SYS_geteuid                 4049
-#define SYS_getegid                 4050
-#define SYS_acct                    4051
-#define SYS_umount2                 4052
-#define SYS_lock                    4053
-#define SYS_ioctl                   4054
-#define SYS_fcntl                   4055
-#define SYS_mpx                     4056
-#define SYS_setpgid                 4057
-#define SYS_ulimit                  4058
-#define SYS_unused59                4059
-#define SYS_umask                   4060
-#define SYS_chroot                  4061
-#define SYS_ustat                   4062
-#define SYS_dup2                    4063
-#define SYS_getppid                 4064
-#define SYS_getpgrp                 4065
-#define SYS_setsid                  4066
-#define SYS_sigaction               4067
-#define SYS_sgetmask                4068
-#define SYS_ssetmask                4069
-#define SYS_setreuid                4070
-#define SYS_setregid                4071
-#define SYS_sigsuspend              4072
-#define SYS_sigpending              4073
-#define SYS_sethostname             4074
-#define SYS_setrlimit               4075
-#define SYS_getrlimit               4076
-#define SYS_getrusage               4077
-#define SYS_gettimeofday            4078
-#define SYS_settimeofday            4079
-#define SYS_getgroups               4080
-#define SYS_setgroups               4081
-#define SYS_reserved82              4082
-#define SYS_symlink                 4083
-#define SYS_unused84                4084
-#define SYS_readlink                4085
-#define SYS_uselib                  4086
-#define SYS_swapon                  4087
-#define SYS_reboot                  4088
-#define SYS_readdir                 4089
-#define SYS_mmap                    4090
-#define SYS_munmap                  4091
-#define SYS_truncate                4092
-#define SYS_ftruncate               4093
-#define SYS_fchmod                  4094
-#define SYS_fchown                  4095
-#define SYS_getpriority             4096
-#define SYS_setpriority             4097
-#define SYS_profil                  4098
-#define SYS_statfs                  4099
-#define SYS_fstatfs                 4100
-#define SYS_ioperm                  4101
-#define SYS_socketcall              4102
-#define SYS_syslog                  4103
-#define SYS_setitimer               4104
-#define SYS_getitimer               4105
-#define SYS_stat                    4106
-#define SYS_lstat                   4107
-#define SYS_fstat                   4108
-#define SYS_unused109               4109
-#define SYS_iopl                    4110
-#define SYS_vhangup                 4111
-#define SYS_idle                    4112
-#define SYS_vm86                    4113
-#define SYS_wait4                   4114
-#define SYS_swapoff                 4115
-#define SYS_sysinfo                 4116
-#define SYS_ipc                     4117
-#define SYS_fsync                   4118
-#define SYS_sigreturn               4119
-#define SYS_clone                   4120
-#define SYS_setdomainname           4121
-#define SYS_uname                   4122
-#define SYS_modify_ldt              4123
-#define SYS_adjtimex                4124
-#define SYS_mprotect                4125
-#define SYS_sigprocmask             4126
-#define SYS_create_module           4127
-#define SYS_init_module             4128
-#define SYS_delete_module           4129
-#define SYS_get_kernel_syms         4130
-#define SYS_quotactl                4131
-#define SYS_getpgid                 4132
-#define SYS_fchdir                  4133
-#define SYS_bdflush                 4134
-#define SYS_sysfs                   4135
-#define SYS_personality             4136
-#define SYS_afs_syscall             4137
-#define SYS_setfsuid                4138
-#define SYS_setfsgid                4139
-#define SYS__llseek                 4140
-#define SYS_getdents                4141
-#define SYS_select                  4142
-#define SYS_flock                   4143
-#define SYS_msync                   4144
-#define SYS_readv                   4145
-#define SYS_writev                  4146
-#define SYS_cacheflush              4147
-#define SYS_cachectl                4148
-#define SYS_sysmips                 4149
-#define SYS_unused150               4150
-#define SYS_getsid                  4151
-#define SYS_fdatasync               4152
-#define SYS__sysctl                 4153
-#define SYS_mlock                   4154
-#define SYS_munlock                 4155
-#define SYS_mlockall                4156
-#define SYS_munlockall              4157
-#define SYS_sched_setparam          4158
-#define SYS_sched_getparam          4159
-#define SYS_sched_setscheduler      4160
-#define SYS_sched_getscheduler      4161
-#define SYS_sched_yield             4162
-#define SYS_sched_get_priority_max  4163
-#define SYS_sched_get_priority_min  4164
-#define SYS_sched_rr_get_interval   4165
-#define SYS_nanosleep               4166
-#define SYS_mremap                  4167
-#define SYS_accept                  4168
-#define SYS_bind                    4169
-#define SYS_connect                 4170
-#define SYS_getpeername             4171
-#define SYS_getsockname             4172
-#define SYS_getsockopt              4173
-#define SYS_listen                  4174
-#define SYS_recv                    4175
-#define SYS_recvfrom                4176
-#define SYS_recvmsg                 4177
-#define SYS_send                    4178
-#define SYS_sendmsg                 4179
-#define SYS_sendto                  4180
-#define SYS_setsockopt              4181
-#define SYS_shutdown                4182
-#define SYS_socket                  4183
-#define SYS_socketpair              4184
-#define SYS_setresuid               4185
-#define SYS_getresuid               4186
-#define SYS_query_module            4187
-#define SYS_poll                    4188
-#define SYS_nfsservctl              4189
-#define SYS_setresgid               4190
-#define SYS_getresgid               4191
-#define SYS_prctl                   4192
-#define SYS_rt_sigreturn            4193
-#define SYS_rt_sigaction            4194
-#define SYS_rt_sigprocmask          4195
-#define SYS_rt_sigpending           4196
-#define SYS_rt_sigtimedwait         4197
-#define SYS_rt_sigqueueinfo         4198
-#define SYS_rt_sigsuspend           4199
-#define SYS_pread                   4200
-#define SYS_pwrite                  4201
-#define SYS_chown                   4202
-#define SYS_getcwd                  4203
-#define SYS_capget                  4204
-#define SYS_capset                  4205
-#define SYS_sigaltstack             4206
-#define SYS_sendfile                4207
-#define SYS_getpmsg                 4208
-#define SYS_putpmsg                 4209
-#define SYS_mmap2                   4210
-#define SYS_truncate64              4211
-#define SYS_ftruncate64             4212
-#define SYS_stat64                  4213
-#define SYS_lstat64                 4214
-#define SYS_fstat64                 4215
-#define SYS_pivot_root              4216
-#define SYS_mincore                 4217
-#define SYS_madvise                 4218
-#define SYS_getdents64              4219
-#define SYS_fcntl64                 4220
-#define SYS_reserved221             4221
-#define SYS_gettid                  4222
-#define SYS_readahead               4223
-#define SYS_setxattr                4224
-#define SYS_lsetxattr               4225
-#define SYS_fsetxattr               4226
-#define SYS_getxattr                4227
-#define SYS_lgetxattr               4228
-#define SYS_fgetxattr               4229
-#define SYS_listxattr               4230
-#define SYS_llistxattr              4231
-#define SYS_flistxattr              4232
-#define SYS_removexattr             4233
-#define SYS_lremovexattr            4234
-#define SYS_fremovexattr            4235
-#define SYS_tkill                   4236
-#define SYS_sendfile64              4237
-#define SYS_futex                   4238
-#define SYS_sched_setaffinity       4239
-#define SYS_sched_getaffinity       4240
-#define SYS_io_setup                4241
-#define SYS_io_destroy              4242
-#define SYS_io_getevents            4243
-#define SYS_io_submit               4244
-#define SYS_io_cancel               4245
-#define SYS_exit_group              4246
-#define SYS_lookup_dcookie          4247
-#define SYS_epoll_create            4248
-#define SYS_epoll_ctl               4249
-#define SYS_epoll_wait              4250
-#define SYS_remap_file_pages        4251
-#define SYS_set_tid_address         4252
-#define SYS_restart_syscall         4253
-#define SYS_fadvise                 4254
-#define SYS_statfs64                4255
-#define SYS_fstatfs64               4256
-#define SYS_timer_create            4257
-#define SYS_timer_settime           4258
-#define SYS_timer_gettime           4259
-#define SYS_timer_getoverrun        4260
-#define SYS_timer_delete            4261
-#define SYS_clock_settime           4262
-#define SYS_clock_gettime           4263
-#define SYS_clock_getres            4264
-#define SYS_clock_nanosleep         4265
-#define SYS_tgkill                  4266
-#define SYS_utimes                  4267
-#define SYS_mbind                   4268
-#define SYS_get_mempolicy           4269
-#define SYS_set_mempolicy           4270
-#define SYS_mq_open                 4271
-#define SYS_mq_unlink               4272
-#define SYS_mq_timedsend            4273
-#define SYS_mq_timedreceive         4274
-#define SYS_mq_notify               4275
-#define SYS_mq_getsetattr           4276
-#define SYS_vserver                 4277
-#define SYS_waitid                  4278
-#define SYS_add_key                 4280
-#define SYS_request_key             4281
-#define SYS_keyctl                  4282
-#define SYS_set_thread_area         4283
-#define SYS_inotify_init            4284
-#define SYS_inotify_add_watch       4285
-#define SYS_inotify_rm_watch        4286
-#define SYS_migrate_pages           4287
-#define SYS_openat                  4288
-#define SYS_mkdirat                 4289
-#define SYS_mknodat                 4290
-#define SYS_fchownat                4291
-#define SYS_futimesat               4292
-#define SYS_fstatat                 4293
-#define SYS_unlinkat                4294
-#define SYS_renameat                4295
-#define SYS_linkat                  4296
-#define SYS_symlinkat               4297
-#define SYS_readlinkat              4298
-#define SYS_fchmodat                4299
-#define SYS_faccessat               4300
-#define SYS_pselect6                4301
-#define SYS_ppoll                   4302
-#define SYS_unshare                 4303
-#define SYS_splice                  4304
-#define SYS_sync_file_range         4305
-#define SYS_tee                     4306
-#define SYS_vmsplice                4307
-#define SYS_move_pages              4308
-#define SYS_set_robust_list         4309
-#define SYS_get_robust_list         4310
-#define SYS_kexec_load              4311
-#define SYS_getcpu                  4312
-#define SYS_epoll_pwait             4313
-#define SYS_ioprio_set              4314
-#define SYS_ioprio_get              4315
-#define SYS_utimensat               4316
-#define SYS_signalfd                4317
-#define SYS_timerfd                 4318
-#define SYS_eventfd                 4319
-#define SYS_fallocate               4320
-#define SYS_timerfd_create          4321
-#define SYS_timerfd_gettime         4322
-#define SYS_timerfd_settime         4323
-#define SYS_signalfd4               4324
-#define SYS_eventfd2                4325
-#define SYS_epoll_create1           4326
-#define SYS_dup3                    4327
-#define SYS_pipe2                   4328
-#define SYS_inotify_init1           4329
-#define SYS_preadv                  4330
-#define SYS_pwritev                 4331
-#define SYS_rt_tgsigqueueinfo       4332
-#define SYS_perf_event_open         4333
-#define SYS_accept4                 4334
-#define SYS_recvmmsg                4335
-#define SYS_fanotify_init           4336
-#define SYS_fanotify_mark           4337
-#define SYS_prlimit64               4338
-#define SYS_name_to_handle_at       4339
-#define SYS_open_by_handle_at       4340
-#define SYS_clock_adjtime           4341
-#define SYS_syncfs                  4342
-#define SYS_sendmmsg                4343
-#define SYS_setns                   4344
-#define SYS_process_vm_readv        4345
-#define SYS_process_vm_writev       4346
-#define SYS_kcmp                    4347
-#define SYS_finit_module            4348
-#define SYS_sched_setattr           4349
-#define SYS_sched_getattr           4350
-#define SYS_renameat2               4351
-#define SYS_seccomp                 4352
-#define SYS_getrandom               4353
-#define SYS_memfd_create            4354
-#define SYS_bpf                     4355
-#define SYS_execveat                4356
-#define SYS_userfaultfd             4357
-#define SYS_membarrier              4358
-#define SYS_mlock2                  4359
-#define SYS_copy_file_range         4360
diff --git a/arch/mips64/bits/syscall.h b/arch/mips64/bits/syscall.h.in
index a84a5197..0e206830 100644
--- a/arch/mips64/bits/syscall.h
+++ b/arch/mips64/bits/syscall.h.in
@@ -319,323 +319,3 @@
 #define __NR_mlock2			5319
 #define __NR_copy_file_range		5320
 
-#define SYS_read			5000
-#define SYS_write			5001
-#define SYS_open			5002
-#define SYS_close			5003
-#define SYS_stat			5004
-#define SYS_fstat			5005
-#define SYS_lstat			5006
-#define SYS_poll			5007
-#define SYS_lseek			5008
-#define SYS_mmap			5009
-#define SYS_mprotect			5010
-#define SYS_munmap			5011
-#define SYS_brk				5012
-#define SYS_rt_sigaction		5013
-#define SYS_rt_sigprocmask		5014
-#define SYS_ioctl			5015
-#define SYS_pread64			5016
-#define SYS_pwrite64			5017
-#define SYS_readv			5018
-#define SYS_writev			5019
-#define SYS_access			5020
-#define SYS_pipe			5021
-#define SYS__newselect			5022
-#define SYS_sched_yield			5023
-#define SYS_mremap			5024
-#define SYS_msync			5025
-#define SYS_mincore			5026
-#define SYS_madvise			5027
-#define SYS_shmget			5028
-#define SYS_shmat			5029
-#define SYS_shmctl			5030
-#define SYS_dup				5031
-#define SYS_dup2			5032
-#define SYS_pause			5033
-#define SYS_nanosleep			5034
-#define SYS_getitimer			5035
-#define SYS_setitimer			5036
-#define SYS_alarm			5037
-#define SYS_getpid			5038
-#define SYS_sendfile			5039
-#define SYS_socket			5040
-#define SYS_connect			5041
-#define SYS_accept			5042
-#define SYS_sendto			5043
-#define SYS_recvfrom			5044
-#define SYS_sendmsg			5045
-#define SYS_recvmsg			5046
-#define SYS_shutdown			5047
-#define SYS_bind			5048
-#define SYS_listen			5049
-#define SYS_getsockname			5050
-#define SYS_getpeername			5051
-#define SYS_socketpair			5052
-#define SYS_setsockopt			5053
-#define SYS_getsockopt			5054
-#define SYS_clone			5055
-#define SYS_fork			5056
-#define SYS_execve			5057
-#define SYS_exit			5058
-#define SYS_wait4			5059
-#define SYS_kill			5060
-#define SYS_uname			5061
-#define SYS_semget			5062
-#define SYS_semop			5063
-#define SYS_semctl			5064
-#define SYS_shmdt			5065
-#define SYS_msgget			5066
-#define SYS_msgsnd			5067
-#define SYS_msgrcv			5068
-#define SYS_msgctl			5069
-#define SYS_fcntl			5070
-#define SYS_flock			5071
-#define SYS_fsync			5072
-#define SYS_fdatasync			5073
-#define SYS_truncate			5074
-#define SYS_ftruncate			5075
-#define SYS_getdents			5076
-#define SYS_getcwd			5077
-#define SYS_chdir			5078
-#define SYS_fchdir			5079
-#define SYS_rename			5080
-#define SYS_mkdir			5081
-#define SYS_rmdir			5082
-#define SYS_creat			5083
-#define SYS_link			5084
-#define SYS_unlink			5085
-#define SYS_symlink			5086
-#define SYS_readlink			5087
-#define SYS_chmod			5088
-#define SYS_fchmod			5089
-#define SYS_chown			5090
-#define SYS_fchown			5091
-#define SYS_lchown			5092
-#define SYS_umask			5093
-#define SYS_gettimeofday		5094
-#define SYS_getrlimit			5095
-#define SYS_getrusage			5096
-#define SYS_sysinfo			5097
-#define SYS_times			5098
-#define SYS_ptrace			5099
-#define SYS_getuid			5100
-#define SYS_syslog			5101
-#define SYS_getgid			5102
-#define SYS_setuid			5103
-#define SYS_setgid			5104
-#define SYS_geteuid			5105
-#define SYS_getegid			5106
-#define SYS_setpgid			5107
-#define SYS_getppid			5108
-#define SYS_getpgrp			5109
-#define SYS_setsid			5110
-#define SYS_setreuid			5111
-#define SYS_setregid			5112
-#define SYS_getgroups			5113
-#define SYS_setgroups			5114
-#define SYS_setresuid			5115
-#define SYS_getresuid			5116
-#define SYS_setresgid			5117
-#define SYS_getresgid			5118
-#define SYS_getpgid			5119
-#define SYS_setfsuid			5120
-#define SYS_setfsgid			5121
-#define SYS_getsid			5122
-#define SYS_capget			5123
-#define SYS_capset			5124
-#define SYS_rt_sigpending		5125
-#define SYS_rt_sigtimedwait		5126
-#define SYS_rt_sigqueueinfo		5127
-#define SYS_rt_sigsuspend		5128
-#define SYS_sigaltstack			5129
-#define SYS_utime			5130
-#define SYS_mknod			5131
-#define SYS_personality			5132
-#define SYS_ustat			5133
-#define SYS_statfs			5134
-#define SYS_fstatfs			5135
-#define SYS_sysfs			5136
-#define SYS_getpriority			5137
-#define SYS_setpriority			5138
-#define SYS_sched_setparam		5139
-#define SYS_sched_getparam		5140
-#define SYS_sched_setscheduler		5141
-#define SYS_sched_getscheduler		5142
-#define SYS_sched_get_priority_max	5143
-#define SYS_sched_get_priority_min	5144
-#define SYS_sched_rr_get_interval	5145
-#define SYS_mlock			5146
-#define SYS_munlock			5147
-#define SYS_mlockall			5148
-#define SYS_munlockall			5149
-#define SYS_vhangup			5150
-#define SYS_pivot_root			5151
-#define SYS__sysctl			5152
-#define SYS_prctl			5153
-#define SYS_adjtimex			5154
-#define SYS_setrlimit			5155
-#define SYS_chroot			5156
-#define SYS_sync			5157
-#define SYS_acct			5158
-#define SYS_settimeofday		5159
-#define SYS_mount			5160
-#define SYS_umount2			5161
-#define SYS_swapon			5162
-#define SYS_swapoff			5163
-#define SYS_reboot			5164
-#define SYS_sethostname			5165
-#define SYS_setdomainname		5166
-#define SYS_create_module		5167
-#define SYS_init_module			5168
-#define SYS_delete_module		5169
-#define SYS_get_kernel_syms		5170
-#define SYS_query_module		5171
-#define SYS_quotactl			5172
-#define SYS_nfsservctl			5173
-#define SYS_getpmsg			5174
-#define SYS_putpmsg			5175
-#define SYS_afs_syscall			5176
-#define SYS_reserved177			5177
-#define SYS_gettid			5178
-#define SYS_readahead			5179
-#define SYS_setxattr			5180
-#define SYS_lsetxattr			5181
-#define SYS_fsetxattr			5182
-#define SYS_getxattr			5183
-#define SYS_lgetxattr			5184
-#define SYS_fgetxattr			5185
-#define SYS_listxattr			5186
-#define SYS_llistxattr			5187
-#define SYS_flistxattr			5188
-#define SYS_removexattr			5189
-#define SYS_lremovexattr		5190
-#define SYS_fremovexattr		5191
-#define SYS_tkill			5192
-#define SYS_reserved193			5193
-#define SYS_futex			5194
-#define SYS_sched_setaffinity		5195
-#define SYS_sched_getaffinity		5196
-#define SYS_cacheflush			5197
-#define SYS_cachectl			5198
-#define SYS_sysmips			5199
-#define SYS_io_setup			5200
-#define SYS_io_destroy			5201
-#define SYS_io_getevents		5202
-#define SYS_io_submit			5203
-#define SYS_io_cancel			5204
-#define SYS_exit_group			5205
-#define SYS_lookup_dcookie		5206
-#define SYS_epoll_create		5207
-#define SYS_epoll_ctl			5208
-#define SYS_epoll_wait			5209
-#define SYS_remap_file_pages		5210
-#define SYS_rt_sigreturn		5211
-#define SYS_set_tid_address		5212
-#define SYS_restart_syscall		5213
-#define SYS_semtimedop			5214
-#define SYS_fadvise64			5215
-#define SYS_timer_create		5216
-#define SYS_timer_settime		5217
-#define SYS_timer_gettime		5218
-#define SYS_timer_getoverrun		5219
-#define SYS_timer_delete		5220
-#define SYS_clock_settime		5221
-#define SYS_clock_gettime		5222
-#define SYS_clock_getres		5223
-#define SYS_clock_nanosleep		5224
-#define SYS_tgkill			5225
-#define SYS_utimes			5226
-#define SYS_mbind			5227
-#define SYS_get_mempolicy		5228
-#define SYS_set_mempolicy		5229
-#define SYS_mq_open			5230
-#define SYS_mq_unlink			5231
-#define SYS_mq_timedsend		5232
-#define SYS_mq_timedreceive		5233
-#define SYS_mq_notify			5234
-#define SYS_mq_getsetattr		5235
-#define SYS_vserver			5236
-#define SYS_waitid			5237
-#define SYS_add_key			5239
-#define SYS_request_key			5240
-#define SYS_keyctl			5241
-#define SYS_set_thread_area		5242
-#define SYS_inotify_init		5243
-#define SYS_inotify_add_watch		5244
-#define SYS_inotify_rm_watch		5245
-#define SYS_migrate_pages		5246
-#define SYS_openat			5247
-#define SYS_mkdirat			5248
-#define SYS_mknodat			5249
-#define SYS_fchownat			5250
-#define SYS_futimesat			5251
-#define SYS_newfstatat			5252
-#define SYS_unlinkat			5253
-#define SYS_renameat			5254
-#define SYS_linkat			5255
-#define SYS_symlinkat			5256
-#define SYS_readlinkat			5257
-#define SYS_fchmodat			5258
-#define SYS_faccessat			5259
-#define SYS_pselect6			5260
-#define SYS_ppoll			5261
-#define SYS_unshare			5262
-#define SYS_splice			5263
-#define SYS_sync_file_range		5264
-#define SYS_tee				5265
-#define SYS_vmsplice			5266
-#define SYS_move_pages			5267
-#define SYS_set_robust_list		5268
-#define SYS_get_robust_list		5269
-#define SYS_kexec_load			5270
-#define SYS_getcpu			5271
-#define SYS_epoll_pwait			5272
-#define SYS_ioprio_set			5273
-#define SYS_ioprio_get			5274
-#define SYS_utimensat			5275
-#define SYS_signalfd			5276
-#define SYS_timerfd			5277
-#define SYS_eventfd			5278
-#define SYS_fallocate			5279
-#define SYS_timerfd_create		5280
-#define SYS_timerfd_gettime		5281
-#define SYS_timerfd_settime		5282
-#define SYS_signalfd4			5283
-#define SYS_eventfd2			5284
-#define SYS_epoll_create1		5285
-#define SYS_dup3			5286
-#define SYS_pipe2			5287
-#define SYS_inotify_init1		5288
-#define SYS_preadv			5289
-#define SYS_pwritev			5290
-#define SYS_rt_tgsigqueueinfo		5291
-#define SYS_perf_event_open		5292
-#define SYS_accept4			5293
-#define SYS_recvmmsg			5294
-#define SYS_fanotify_init		5295
-#define SYS_fanotify_mark		5296
-#define SYS_prlimit64			5297
-#define SYS_name_to_handle_at		5298
-#define SYS_open_by_handle_at		5299
-#define SYS_clock_adjtime		5300
-#define SYS_syncfs			5301
-#define SYS_sendmmsg			5302
-#define SYS_setns			5303
-#define SYS_process_vm_readv		5304
-#define SYS_process_vm_writev		5305
-#define SYS_kcmp			5306
-#define SYS_finit_module		5307
-#define SYS_getdents64			5308
-#define SYS_sched_setattr		5309
-#define SYS_sched_getattr		5310
-#define SYS_renameat2			5311
-#define SYS_seccomp			5312
-#define SYS_getrandom			5313
-#define SYS_memfd_create		5314
-#define SYS_bpf				5315
-#define SYS_execveat			5316
-#define SYS_userfaultfd			5317
-#define SYS_membarrier			5318
-#define SYS_mlock2			5319
-#define SYS_copy_file_range		5320
diff --git a/arch/mipsn32/bits/syscall.h b/arch/mipsn32/bits/syscall.h.in
index 09e4a25c..6c38f68d 100644
--- a/arch/mipsn32/bits/syscall.h
+++ b/arch/mipsn32/bits/syscall.h.in
@@ -323,327 +323,3 @@
 #define __NR_mlock2			6323
 #define __NR_copy_file_range		6324
 
-#define SYS_read			6000
-#define SYS_write			6001
-#define SYS_open			6002
-#define SYS_close			6003
-#define SYS_stat			6004
-#define SYS_fstat			6005
-#define SYS_lstat			6006
-#define SYS_poll			6007
-#define SYS_lseek			6008
-#define SYS_mmap			6009
-#define SYS_mprotect			6010
-#define SYS_munmap			6011
-#define SYS_brk				6012
-#define SYS_rt_sigaction		6013
-#define SYS_rt_sigprocmask		6014
-#define SYS_ioctl			6015
-#define SYS_pread64			6016
-#define SYS_pwrite64			6017
-#define SYS_readv			6018
-#define SYS_writev			6019
-#define SYS_access			6020
-#define SYS_pipe			6021
-#define SYS__newselect			6022
-#define SYS_sched_yield			6023
-#define SYS_mremap			6024
-#define SYS_msync			6025
-#define SYS_mincore			6026
-#define SYS_madvise			6027
-#define SYS_shmget			6028
-#define SYS_shmat			6029
-#define SYS_shmctl			6030
-#define SYS_dup				6031
-#define SYS_dup2			6032
-#define SYS_pause			6033
-#define SYS_nanosleep			6034
-#define SYS_getitimer			6035
-#define SYS_setitimer			6036
-#define SYS_alarm			6037
-#define SYS_getpid			6038
-#define SYS_sendfile			6039
-#define SYS_socket			6040
-#define SYS_connect			6041
-#define SYS_accept			6042
-#define SYS_sendto			6043
-#define SYS_recvfrom			6044
-#define SYS_sendmsg			6045
-#define SYS_recvmsg			6046
-#define SYS_shutdown			6047
-#define SYS_bind			6048
-#define SYS_listen			6049
-#define SYS_getsockname			6050
-#define SYS_getpeername			6051
-#define SYS_socketpair			6052
-#define SYS_setsockopt			6053
-#define SYS_getsockopt			6054
-#define SYS_clone			6055
-#define SYS_fork			6056
-#define SYS_execve			6057
-#define SYS_exit			6058
-#define SYS_wait4			6059
-#define SYS_kill			6060
-#define SYS_uname			6061
-#define SYS_semget			6062
-#define SYS_semop			6063
-#define SYS_semctl			6064
-#define SYS_shmdt			6065
-#define SYS_msgget			6066
-#define SYS_msgsnd			6067
-#define SYS_msgrcv			6068
-#define SYS_msgctl			6069
-#define SYS_fcntl			6070
-#define SYS_flock			6071
-#define SYS_fsync			6072
-#define SYS_fdatasync			6073
-#define SYS_truncate			6074
-#define SYS_ftruncate			6075
-#define SYS_getdents			6076
-#define SYS_getcwd			6077
-#define SYS_chdir			6078
-#define SYS_fchdir			6079
-#define SYS_rename			6080
-#define SYS_mkdir			6081
-#define SYS_rmdir			6082
-#define SYS_creat			6083
-#define SYS_link			6084
-#define SYS_unlink			6085
-#define SYS_symlink			6086
-#define SYS_readlink			6087
-#define SYS_chmod			6088
-#define SYS_fchmod			6089
-#define SYS_chown			6090
-#define SYS_fchown			6091
-#define SYS_lchown			6092
-#define SYS_umask			6093
-#define SYS_gettimeofday		6094
-#define SYS_getrlimit			6095
-#define SYS_getrusage			6096
-#define SYS_sysinfo			6097
-#define SYS_times			6098
-#define SYS_ptrace			6099
-#define SYS_getuid			6100
-#define SYS_syslog			6101
-#define SYS_getgid			6102
-#define SYS_setuid			6103
-#define SYS_setgid			6104
-#define SYS_geteuid			6105
-#define SYS_getegid			6106
-#define SYS_setpgid			6107
-#define SYS_getppid			6108
-#define SYS_getpgrp			6109
-#define SYS_setsid			6110
-#define SYS_setreuid			6111
-#define SYS_setregid			6112
-#define SYS_getgroups			6113
-#define SYS_setgroups			6114
-#define SYS_setresuid			6115
-#define SYS_getresuid			6116
-#define SYS_setresgid			6117
-#define SYS_getresgid			6118
-#define SYS_getpgid			6119
-#define SYS_setfsuid			6120
-#define SYS_setfsgid			6121
-#define SYS_getsid			6122
-#define SYS_capget			6123
-#define SYS_capset			6124
-#define SYS_rt_sigpending		6125
-#define SYS_rt_sigtimedwait		6126
-#define SYS_rt_sigqueueinfo		6127
-#define SYS_rt_sigsuspend		6128
-#define SYS_sigaltstack			6129
-#define SYS_utime			6130
-#define SYS_mknod			6131
-#define SYS_personality			6132
-#define SYS_ustat			6133
-#define SYS_statfs			6134
-#define SYS_fstatfs			6135
-#define SYS_sysfs			6136
-#define SYS_getpriority			6137
-#define SYS_setpriority			6138
-#define SYS_sched_setparam		6139
-#define SYS_sched_getparam		6140
-#define SYS_sched_setscheduler		6141
-#define SYS_sched_getscheduler		6142
-#define SYS_sched_get_priority_max	6143
-#define SYS_sched_get_priority_min	6144
-#define SYS_sched_rr_get_interval	6145
-#define SYS_mlock			6146
-#define SYS_munlock			6147
-#define SYS_mlockall			6148
-#define SYS_munlockall			6149
-#define SYS_vhangup			6150
-#define SYS_pivot_root			6151
-#define SYS__sysctl			6152
-#define SYS_prctl			6153
-#define SYS_adjtimex			6154
-#define SYS_setrlimit			6155
-#define SYS_chroot			6156
-#define SYS_sync			6157
-#define SYS_acct			6158
-#define SYS_settimeofday		6159
-#define SYS_mount			6160
-#define SYS_umount2			6161
-#define SYS_swapon			6162
-#define SYS_swapoff			6163
-#define SYS_reboot			6164
-#define SYS_sethostname			6165
-#define SYS_setdomainname		6166
-#define SYS_create_module		6167
-#define SYS_init_module			6168
-#define SYS_delete_module		6169
-#define SYS_get_kernel_syms		6170
-#define SYS_query_module		6171
-#define SYS_quotactl			6172
-#define SYS_nfsservctl			6173
-#define SYS_getpmsg			6174
-#define SYS_putpmsg			6175
-#define SYS_afs_syscall			6176
-#define SYS_reserved177			6177
-#define SYS_gettid			6178
-#define SYS_readahead			6179
-#define SYS_setxattr			6180
-#define SYS_lsetxattr			6181
-#define SYS_fsetxattr			6182
-#define SYS_getxattr			6183
-#define SYS_lgetxattr			6184
-#define SYS_fgetxattr			6185
-#define SYS_listxattr			6186
-#define SYS_llistxattr			6187
-#define SYS_flistxattr			6188
-#define SYS_removexattr			6189
-#define SYS_lremovexattr		6190
-#define SYS_fremovexattr		6191
-#define SYS_tkill			6192
-#define SYS_reserved193			6193
-#define SYS_futex			6194
-#define SYS_sched_setaffinity		6195
-#define SYS_sched_getaffinity		6196
-#define SYS_cacheflush			6197
-#define SYS_cachectl			6198
-#define SYS_sysmips			6199
-#define SYS_io_setup			6200
-#define SYS_io_destroy			6201
-#define SYS_io_getevents		6202
-#define SYS_io_submit			6203
-#define SYS_io_cancel			6204
-#define SYS_exit_group			6205
-#define SYS_lookup_dcookie		6206
-#define SYS_epoll_create		6207
-#define SYS_epoll_ctl			6208
-#define SYS_epoll_wait			6209
-#define SYS_remap_file_pages		6210
-#define SYS_rt_sigreturn		6211
-#define SYS_fcntl64			6212
-#define SYS_set_tid_address		6213
-#define SYS_restart_syscall		6214
-#define SYS_semtimedop			6215
-#define SYS_fadvise64			6216
-#define SYS_statfs64			6217
-#define SYS_fstatfs64			6218
-#define SYS_sendfile64			6219
-#define SYS_timer_create		6220
-#define SYS_timer_settime		6221
-#define SYS_timer_gettime		6222
-#define SYS_timer_getoverrun		6223
-#define SYS_timer_delete		6224
-#define SYS_clock_settime		6225
-#define SYS_clock_gettime		6226
-#define SYS_clock_getres		6227
-#define SYS_clock_nanosleep		6228
-#define SYS_tgkill			6229
-#define SYS_utimes			6230
-#define SYS_mbind			6231
-#define SYS_get_mempolicy		6232
-#define SYS_set_mempolicy		6233
-#define SYS_mq_open			6234
-#define SYS_mq_unlink			6235
-#define SYS_mq_timedsend		6236
-#define SYS_mq_timedreceive		6237
-#define SYS_mq_notify			6238
-#define SYS_mq_getsetattr		6239
-#define SYS_vserver			6240
-#define SYS_waitid			6241
-#define SYS_add_key			6243
-#define SYS_request_key			6244
-#define SYS_keyctl			6245
-#define SYS_set_thread_area		6246
-#define SYS_inotify_init		6247
-#define SYS_inotify_add_watch		6248
-#define SYS_inotify_rm_watch		6249
-#define SYS_migrate_pages		6250
-#define SYS_openat			6251
-#define SYS_mkdirat			6252
-#define SYS_mknodat			6253
-#define SYS_fchownat			6254
-#define SYS_futimesat			6255
-#define SYS_fstatat			6256
-#define SYS_unlinkat			6257
-#define SYS_renameat			6258
-#define SYS_linkat			6259
-#define SYS_symlinkat			6260
-#define SYS_readlinkat			6261
-#define SYS_fchmodat			6262
-#define SYS_faccessat			6263
-#define SYS_pselect6			6264
-#define SYS_ppoll			6265
-#define SYS_unshare			6266
-#define SYS_splice			6267
-#define SYS_sync_file_range		6268
-#define SYS_tee				6269
-#define SYS_vmsplice			6270
-#define SYS_move_pages			6271
-#define SYS_set_robust_list		6272
-#define SYS_get_robust_list		6273
-#define SYS_kexec_load			6274
-#define SYS_getcpu			6275
-#define SYS_epoll_pwait			6276
-#define SYS_ioprio_set			6277
-#define SYS_ioprio_get			6278
-#define SYS_utimensat			6279
-#define SYS_signalfd			6280
-#define SYS_timerfd			6281
-#define SYS_eventfd			6282
-#define SYS_fallocate			6283
-#define SYS_timerfd_create		6284
-#define SYS_timerfd_gettime		6285
-#define SYS_timerfd_settime		6286
-#define SYS_signalfd4			6287
-#define SYS_eventfd2			6288
-#define SYS_epoll_create1		6289
-#define SYS_dup3			6290
-#define SYS_pipe2			6291
-#define SYS_inotify_init1		6292
-#define SYS_preadv			6293
-#define SYS_pwritev			6294
-#define SYS_rt_tgsigqueueinfo		6295
-#define SYS_perf_event_open		6296
-#define SYS_accept4			6297
-#define SYS_recvmmsg			6298
-#define SYS_getdents64			6299
-#define SYS_fanotify_init		6300
-#define SYS_fanotify_mark		6301
-#define SYS_prlimit64			6302
-#define SYS_name_to_handle_at		6303
-#define SYS_open_by_handle_at		6304
-#define SYS_clock_adjtime		6305
-#define SYS_syncfs			6306
-#define SYS_sendmmsg			6307
-#define SYS_setns			6308
-#define SYS_process_vm_readv		6309
-#define SYS_process_vm_writev		6310
-#define SYS_kcmp			6311
-#define SYS_finit_module		6312
-#define SYS_sched_setattr		6313
-#define SYS_sched_getattr		6314
-#define SYS_renameat2			6315
-#define SYS_seccomp			6316
-#define SYS_getrandom			6317
-#define SYS_memfd_create		6318
-#define SYS_bpf				6319
-#define SYS_execveat			6320
-#define SYS_userfaultfd			6321
-#define SYS_membarrier			6322
-#define SYS_mlock2			6323
-#define SYS_copy_file_range		6324
diff --git a/arch/or1k/bits/syscall.h b/arch/or1k/bits/syscall.h
deleted file mode 100644
index de810a4d..00000000
--- a/arch/or1k/bits/syscall.h
+++ /dev/null
@@ -1,543 +0,0 @@
-#define __NR_io_setup 0
-#define __NR_io_destroy 1
-#define __NR_io_submit 2
-#define __NR_io_cancel 3
-#define __NR_io_getevents 4
-#define __NR_setxattr 5
-#define __NR_lsetxattr 6
-#define __NR_fsetxattr 7
-#define __NR_getxattr 8
-#define __NR_lgetxattr 9
-#define __NR_fgetxattr 10
-#define __NR_listxattr 11
-#define __NR_llistxattr 12
-#define __NR_flistxattr 13
-#define __NR_removexattr 14
-#define __NR_lremovexattr 15
-#define __NR_fremovexattr 16
-#define __NR_getcwd 17
-#define __NR_lookup_dcookie 18
-#define __NR_eventfd2 19
-#define __NR_epoll_create1 20
-#define __NR_epoll_ctl 21
-#define __NR_epoll_pwait 22
-#define __NR_dup 23
-#define __NR_dup3 24
-#define __NR_fcntl64 25
-#define __NR_inotify_init1 26
-#define __NR_inotify_add_watch 27
-#define __NR_inotify_rm_watch 28
-#define __NR_ioctl 29
-#define __NR_ioprio_set 30
-#define __NR_ioprio_get 31
-#define __NR_flock 32
-#define __NR_mknodat 33
-#define __NR_mkdirat 34
-#define __NR_unlinkat 35
-#define __NR_symlinkat 36
-#define __NR_linkat 37
-#define __NR_renameat 38
-#define __NR_umount2 39
-#define __NR_mount 40
-#define __NR_pivot_root 41
-#define __NR_nfsservctl 42
-#define __NR_statfs64 43
-#define __NR_fstatfs64 44
-#define __NR_truncate64 45
-#define __NR_ftruncate64 46
-#define __NR_fallocate 47
-#define __NR_faccessat 48
-#define __NR_chdir 49
-#define __NR_fchdir 50
-#define __NR_chroot 51
-#define __NR_fchmod 52
-#define __NR_fchmodat 53
-#define __NR_fchownat 54
-#define __NR_fchown 55
-#define __NR_openat 56
-#define __NR_close 57
-#define __NR_vhangup 58
-#define __NR_pipe2 59
-#define __NR_quotactl 60
-#define __NR_getdents64 61
-#define __NR__llseek 62
-#define __NR_read 63
-#define __NR_write 64
-#define __NR_readv 65
-#define __NR_writev 66
-#define __NR_pread64 67
-#define __NR_pwrite64 68
-#define __NR_preadv 69
-#define __NR_pwritev 70
-#define __NR_sendfile64 71
-#define __NR_pselect6 72
-#define __NR_ppoll 73
-#define __NR_signalfd4 74
-#define __NR_vmsplice 75
-#define __NR_splice 76
-#define __NR_tee 77
-#define __NR_readlinkat 78
-#define __NR_fstatat64 79
-#define __NR_fstat64 80
-#define __NR_sync 81
-#define __NR_fsync 82
-#define __NR_fdatasync 83
-#define __NR_sync_file_range 84
-#define __NR_timerfd_create 85
-#define __NR_timerfd_settime 86
-#define __NR_timerfd_gettime 87
-#define __NR_utimensat 88
-#define __NR_acct 89
-#define __NR_capget 90
-#define __NR_capset 91
-#define __NR_personality 92
-#define __NR_exit 93
-#define __NR_exit_group 94
-#define __NR_waitid 95
-#define __NR_set_tid_address 96
-#define __NR_unshare 97
-#define __NR_futex 98
-#define __NR_set_robust_list 99
-#define __NR_get_robust_list 100
-#define __NR_nanosleep 101
-#define __NR_getitimer 102
-#define __NR_setitimer 103
-#define __NR_kexec_load 104
-#define __NR_init_module 105
-#define __NR_delete_module 106
-#define __NR_timer_create 107
-#define __NR_timer_gettime 108
-#define __NR_timer_getoverrun 109
-#define __NR_timer_settime 110
-#define __NR_timer_delete 111
-#define __NR_clock_settime 112
-#define __NR_clock_gettime 113
-#define __NR_clock_getres 114
-#define __NR_clock_nanosleep 115
-#define __NR_syslog 116
-#define __NR_ptrace 117
-#define __NR_sched_setparam 118
-#define __NR_sched_setscheduler 119
-#define __NR_sched_getscheduler 120
-#define __NR_sched_getparam 121
-#define __NR_sched_setaffinity 122
-#define __NR_sched_getaffinity 123
-#define __NR_sched_yield 124
-#define __NR_sched_get_priority_max 125
-#define __NR_sched_get_priority_min 126
-#define __NR_sched_rr_get_interval 127
-#define __NR_restart_syscall 128
-#define __NR_kill 129
-#define __NR_tkill 130
-#define __NR_tgkill 131
-#define __NR_sigaltstack 132
-#define __NR_rt_sigsuspend 133
-#define __NR_rt_sigaction 134
-#define __NR_rt_sigprocmask 135
-#define __NR_rt_sigpending 136
-#define __NR_rt_sigtimedwait 137
-#define __NR_rt_sigqueueinfo 138
-#define __NR_rt_sigreturn 139
-#define __NR_setpriority 140
-#define __NR_getpriority 141
-#define __NR_reboot 142
-#define __NR_setregid 143
-#define __NR_setgid 144
-#define __NR_setreuid 145
-#define __NR_setuid 146
-#define __NR_setresuid 147
-#define __NR_getresuid 148
-#define __NR_setresgid 149
-#define __NR_getresgid 150
-#define __NR_setfsuid 151
-#define __NR_setfsgid 152
-#define __NR_times 153
-#define __NR_setpgid 154
-#define __NR_getpgid 155
-#define __NR_getsid 156
-#define __NR_setsid 157
-#define __NR_getgroups 158
-#define __NR_setgroups 159
-#define __NR_uname 160
-#define __NR_sethostname 161
-#define __NR_setdomainname 162
-#define __NR_getrlimit 163
-#define __NR_setrlimit 164
-#define __NR_getrusage 165
-#define __NR_umask 166
-#define __NR_prctl 167
-#define __NR_getcpu 168
-#define __NR_gettimeofday 169
-#define __NR_settimeofday 170
-#define __NR_adjtimex 171
-#define __NR_getpid 172
-#define __NR_getppid 173
-#define __NR_getuid 174
-#define __NR_geteuid 175
-#define __NR_getgid 176
-#define __NR_getegid 177
-#define __NR_gettid 178
-#define __NR_sysinfo 179
-#define __NR_mq_open 180
-#define __NR_mq_unlink 181
-#define __NR_mq_timedsend 182
-#define __NR_mq_timedreceive 183
-#define __NR_mq_notify 184
-#define __NR_mq_getsetattr 185
-#define __NR_msgget 186
-#define __NR_msgctl 187
-#define __NR_msgrcv 188
-#define __NR_msgsnd 189
-#define __NR_semget 190
-#define __NR_semctl 191
-#define __NR_semtimedop 192
-#define __NR_semop 193
-#define __NR_shmget 194
-#define __NR_shmctl 195
-#define __NR_shmat 196
-#define __NR_shmdt 197
-#define __NR_socket 198
-#define __NR_socketpair 199
-#define __NR_bind 200
-#define __NR_listen 201
-#define __NR_accept 202
-#define __NR_connect 203
-#define __NR_getsockname 204
-#define __NR_getpeername 205
-#define __NR_sendto 206
-#define __NR_recvfrom 207
-#define __NR_setsockopt 208
-#define __NR_getsockopt 209
-#define __NR_shutdown 210
-#define __NR_sendmsg 211
-#define __NR_recvmsg 212
-#define __NR_readahead 213
-#define __NR_brk 214
-#define __NR_munmap 215
-#define __NR_mremap 216
-#define __NR_add_key 217
-#define __NR_request_key 218
-#define __NR_keyctl 219
-#define __NR_clone 220
-#define __NR_execve 221
-#define __NR_mmap2 222
-#define __NR_fadvise64_64 223
-#define __NR_swapon 224
-#define __NR_swapoff 225
-#define __NR_mprotect 226
-#define __NR_msync 227
-#define __NR_mlock 228
-#define __NR_munlock 229
-#define __NR_mlockall 230
-#define __NR_munlockall 231
-#define __NR_mincore 232
-#define __NR_madvise 233
-#define __NR_remap_file_pages 234
-#define __NR_mbind 235
-#define __NR_get_mempolicy 236
-#define __NR_set_mempolicy 237
-#define __NR_migrate_pages 238
-#define __NR_move_pages 239
-#define __NR_rt_tgsigqueueinfo 240
-#define __NR_perf_event_open 241
-#define __NR_accept4 242
-#define __NR_recvmmsg 243
-#define __NR_or1k_atomic 244
-#define __NR_wait4 260
-#define __NR_prlimit64 261
-#define __NR_fanotify_init 262
-#define __NR_fanotify_mark 263
-#define __NR_name_to_handle_at 264
-#define __NR_open_by_handle_at 265
-#define __NR_clock_adjtime 266
-#define __NR_syncfs 267
-#define __NR_setns 268
-#define __NR_sendmmsg 269
-#define __NR_process_vm_readv 270
-#define __NR_process_vm_writev 271
-#define __NR_kcmp 272
-#define __NR_finit_module 273
-#define __NR_sched_setattr 274
-#define __NR_sched_getattr 275
-#define __NR_renameat2 276
-#define __NR_seccomp 277
-#define __NR_getrandom 278
-#define __NR_memfd_create 279
-#define __NR_bpf 280
-#define __NR_execveat 281
-#define __NR_userfaultfd 282
-#define __NR_membarrier 283
-#define __NR_mlock2 284
-#define __NR_copy_file_range 285
-
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_submit __NR_io_submit
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_setxattr __NR_setxattr
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_getxattr __NR_getxattr
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_removexattr __NR_removexattr
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_getcwd __NR_getcwd
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_dup __NR_dup
-#define SYS_dup3 __NR_dup3
-#define SYS_fcntl64 __NR_fcntl64
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_ioctl __NR_ioctl
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_flock __NR_flock
-#define SYS_mknodat __NR_mknodat
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_linkat __NR_linkat
-#define SYS_renameat __NR_renameat
-#define SYS_umount2 __NR_umount2
-#define SYS_mount __NR_mount
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_nfsservctl __NR_nfsservctl
-#define SYS_statfs64 __NR_statfs64
-#define SYS_fstatfs64 __NR_fstatfs64
-#define SYS_truncate64 __NR_truncate64
-#define SYS_ftruncate64 __NR_ftruncate64
-#define SYS_fallocate __NR_fallocate
-#define SYS_faccessat __NR_faccessat
-#define SYS_chdir __NR_chdir
-#define SYS_fchdir __NR_fchdir
-#define SYS_chroot __NR_chroot
-#define SYS_fchmod __NR_fchmod
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_fchownat __NR_fchownat
-#define SYS_fchown __NR_fchown
-#define SYS_openat __NR_openat
-#define SYS_close __NR_close
-#define SYS_vhangup __NR_vhangup
-#define SYS_pipe2 __NR_pipe2
-#define SYS_quotactl __NR_quotactl
-#define SYS_getdents64 __NR_getdents64
-#define SYS__llseek __NR__llseek
-#define SYS_read __NR_read
-#define SYS_write __NR_write
-#define SYS_readv __NR_readv
-#define SYS_writev __NR_writev
-#define SYS_pread64 __NR_pread64
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_preadv __NR_preadv
-#define SYS_pwritev __NR_pwritev
-#define SYS_sendfile64 __NR_sendfile64
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ppoll __NR_ppoll
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_splice __NR_splice
-#define SYS_tee __NR_tee
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_fstatat64 __NR_fstatat64
-#define SYS_fstat64 __NR_fstat64
-#define SYS_sync __NR_sync
-#define SYS_fsync __NR_fsync
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_sync_file_range __NR_sync_file_range
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_utimensat __NR_utimensat
-#define SYS_acct __NR_acct
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_personality __NR_personality
-#define SYS_exit __NR_exit
-#define SYS_exit_group __NR_exit_group
-#define SYS_waitid __NR_waitid
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_unshare __NR_unshare
-#define SYS_futex __NR_futex
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_getitimer __NR_getitimer
-#define SYS_setitimer __NR_setitimer
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_init_module __NR_init_module
-#define SYS_delete_module __NR_delete_module
-#define SYS_timer_create __NR_timer_create
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_syslog __NR_syslog
-#define SYS_ptrace __NR_ptrace
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_kill __NR_kill
-#define SYS_tkill __NR_tkill
-#define SYS_tgkill __NR_tgkill
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_setpriority __NR_setpriority
-#define SYS_getpriority __NR_getpriority
-#define SYS_reboot __NR_reboot
-#define SYS_setregid __NR_setregid
-#define SYS_setgid __NR_setgid
-#define SYS_setreuid __NR_setreuid
-#define SYS_setuid __NR_setuid
-#define SYS_setresuid __NR_setresuid
-#define SYS_getresuid __NR_getresuid
-#define SYS_setresgid __NR_setresgid
-#define SYS_getresgid __NR_getresgid
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_times __NR_times
-#define SYS_setpgid __NR_setpgid
-#define SYS_getpgid __NR_getpgid
-#define SYS_getsid __NR_getsid
-#define SYS_setsid __NR_setsid
-#define SYS_getgroups __NR_getgroups
-#define SYS_setgroups __NR_setgroups
-#define SYS_uname __NR_uname
-#define SYS_sethostname __NR_sethostname
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_getrlimit __NR_getrlimit
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_getrusage __NR_getrusage
-#define SYS_umask __NR_umask
-#define SYS_prctl __NR_prctl
-#define SYS_getcpu __NR_getcpu
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_getpid __NR_getpid
-#define SYS_getppid __NR_getppid
-#define SYS_getuid __NR_getuid
-#define SYS_geteuid __NR_geteuid
-#define SYS_getgid __NR_getgid
-#define SYS_getegid __NR_getegid
-#define SYS_gettid __NR_gettid
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_msgget __NR_msgget
-#define SYS_msgctl __NR_msgctl
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_semget __NR_semget
-#define SYS_semctl __NR_semctl
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_semop __NR_semop
-#define SYS_shmget __NR_shmget
-#define SYS_shmctl __NR_shmctl
-#define SYS_shmat __NR_shmat
-#define SYS_shmdt __NR_shmdt
-#define SYS_socket __NR_socket
-#define SYS_socketpair __NR_socketpair
-#define SYS_bind __NR_bind
-#define SYS_listen __NR_listen
-#define SYS_accept __NR_accept
-#define SYS_connect __NR_connect
-#define SYS_getsockname __NR_getsockname
-#define SYS_getpeername __NR_getpeername
-#define SYS_sendto __NR_sendto
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_shutdown __NR_shutdown
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_readahead __NR_readahead
-#define SYS_brk __NR_brk
-#define SYS_munmap __NR_munmap
-#define SYS_mremap __NR_mremap
-#define SYS_add_key __NR_add_key
-#define SYS_request_key __NR_request_key
-#define SYS_keyctl __NR_keyctl
-#define SYS_clone __NR_clone
-#define SYS_execve __NR_execve
-#define SYS_mmap2 __NR_mmap2
-#define SYS_fadvise64_64 __NR_fadvise64_64
-#define SYS_swapon __NR_swapon
-#define SYS_swapoff __NR_swapoff
-#define SYS_mprotect __NR_mprotect
-#define SYS_msync __NR_msync
-#define SYS_mlock __NR_mlock
-#define SYS_munlock __NR_munlock
-#define SYS_mlockall __NR_mlockall
-#define SYS_munlockall __NR_munlockall
-#define SYS_mincore __NR_mincore
-#define SYS_madvise __NR_madvise
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_mbind __NR_mbind
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_migrate_pages __NR_migrate_pages
-#define SYS_move_pages __NR_move_pages
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_accept4 __NR_accept4
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_or1k_atomic __NR_or1k_atomic
-#define SYS_wait4 __NR_wait4
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_syncfs __NR_syncfs
-#define SYS_setns __NR_setns
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_kcmp __NR_kcmp
-#define SYS_finit_module __NR_finit_module
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_renameat2 __NR_renameat2
-#define SYS_seccomp __NR_seccomp
-#define SYS_getrandom __NR_getrandom
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_bpf __NR_bpf
-#define SYS_execveat __NR_execveat
-#define SYS_userfaultfd __NR_userfaultfd
-#define SYS_membarrier __NR_membarrier
-#define SYS_mlock2 __NR_mlock2
-#define SYS_copy_file_range __NR_copy_file_range
diff --git a/arch/or1k/bits/syscall.h.in b/arch/or1k/bits/syscall.h.in
new file mode 100644
index 00000000..c6e55c6b
--- /dev/null
+++ b/arch/or1k/bits/syscall.h.in
@@ -0,0 +1,272 @@
+#define __NR_io_setup 0
+#define __NR_io_destroy 1
+#define __NR_io_submit 2
+#define __NR_io_cancel 3
+#define __NR_io_getevents 4
+#define __NR_setxattr 5
+#define __NR_lsetxattr 6
+#define __NR_fsetxattr 7
+#define __NR_getxattr 8
+#define __NR_lgetxattr 9
+#define __NR_fgetxattr 10
+#define __NR_listxattr 11
+#define __NR_llistxattr 12
+#define __NR_flistxattr 13
+#define __NR_removexattr 14
+#define __NR_lremovexattr 15
+#define __NR_fremovexattr 16
+#define __NR_getcwd 17
+#define __NR_lookup_dcookie 18
+#define __NR_eventfd2 19
+#define __NR_epoll_create1 20
+#define __NR_epoll_ctl 21
+#define __NR_epoll_pwait 22
+#define __NR_dup 23
+#define __NR_dup3 24
+#define __NR_fcntl64 25
+#define __NR_inotify_init1 26
+#define __NR_inotify_add_watch 27
+#define __NR_inotify_rm_watch 28
+#define __NR_ioctl 29
+#define __NR_ioprio_set 30
+#define __NR_ioprio_get 31
+#define __NR_flock 32
+#define __NR_mknodat 33
+#define __NR_mkdirat 34
+#define __NR_unlinkat 35
+#define __NR_symlinkat 36
+#define __NR_linkat 37
+#define __NR_renameat 38
+#define __NR_umount2 39
+#define __NR_mount 40
+#define __NR_pivot_root 41
+#define __NR_nfsservctl 42
+#define __NR_statfs64 43
+#define __NR_fstatfs64 44
+#define __NR_truncate64 45
+#define __NR_ftruncate64 46
+#define __NR_fallocate 47
+#define __NR_faccessat 48
+#define __NR_chdir 49
+#define __NR_fchdir 50
+#define __NR_chroot 51
+#define __NR_fchmod 52
+#define __NR_fchmodat 53
+#define __NR_fchownat 54
+#define __NR_fchown 55
+#define __NR_openat 56
+#define __NR_close 57
+#define __NR_vhangup 58
+#define __NR_pipe2 59
+#define __NR_quotactl 60
+#define __NR_getdents64 61
+#define __NR__llseek 62
+#define __NR_read 63
+#define __NR_write 64
+#define __NR_readv 65
+#define __NR_writev 66
+#define __NR_pread64 67
+#define __NR_pwrite64 68
+#define __NR_preadv 69
+#define __NR_pwritev 70
+#define __NR_sendfile64 71
+#define __NR_pselect6 72
+#define __NR_ppoll 73
+#define __NR_signalfd4 74
+#define __NR_vmsplice 75
+#define __NR_splice 76
+#define __NR_tee 77
+#define __NR_readlinkat 78
+#define __NR_fstatat64 79
+#define __NR_fstat64 80
+#define __NR_sync 81
+#define __NR_fsync 82
+#define __NR_fdatasync 83
+#define __NR_sync_file_range 84
+#define __NR_timerfd_create 85
+#define __NR_timerfd_settime 86
+#define __NR_timerfd_gettime 87
+#define __NR_utimensat 88
+#define __NR_acct 89
+#define __NR_capget 90
+#define __NR_capset 91
+#define __NR_personality 92
+#define __NR_exit 93
+#define __NR_exit_group 94
+#define __NR_waitid 95
+#define __NR_set_tid_address 96
+#define __NR_unshare 97
+#define __NR_futex 98
+#define __NR_set_robust_list 99
+#define __NR_get_robust_list 100
+#define __NR_nanosleep 101
+#define __NR_getitimer 102
+#define __NR_setitimer 103
+#define __NR_kexec_load 104
+#define __NR_init_module 105
+#define __NR_delete_module 106
+#define __NR_timer_create 107
+#define __NR_timer_gettime 108
+#define __NR_timer_getoverrun 109
+#define __NR_timer_settime 110
+#define __NR_timer_delete 111
+#define __NR_clock_settime 112
+#define __NR_clock_gettime 113
+#define __NR_clock_getres 114
+#define __NR_clock_nanosleep 115
+#define __NR_syslog 116
+#define __NR_ptrace 117
+#define __NR_sched_setparam 118
+#define __NR_sched_setscheduler 119
+#define __NR_sched_getscheduler 120
+#define __NR_sched_getparam 121
+#define __NR_sched_setaffinity 122
+#define __NR_sched_getaffinity 123
+#define __NR_sched_yield 124
+#define __NR_sched_get_priority_max 125
+#define __NR_sched_get_priority_min 126
+#define __NR_sched_rr_get_interval 127
+#define __NR_restart_syscall 128
+#define __NR_kill 129
+#define __NR_tkill 130
+#define __NR_tgkill 131
+#define __NR_sigaltstack 132
+#define __NR_rt_sigsuspend 133
+#define __NR_rt_sigaction 134
+#define __NR_rt_sigprocmask 135
+#define __NR_rt_sigpending 136
+#define __NR_rt_sigtimedwait 137
+#define __NR_rt_sigqueueinfo 138
+#define __NR_rt_sigreturn 139
+#define __NR_setpriority 140
+#define __NR_getpriority 141
+#define __NR_reboot 142
+#define __NR_setregid 143
+#define __NR_setgid 144
+#define __NR_setreuid 145
+#define __NR_setuid 146
+#define __NR_setresuid 147
+#define __NR_getresuid 148
+#define __NR_setresgid 149
+#define __NR_getresgid 150
+#define __NR_setfsuid 151
+#define __NR_setfsgid 152
+#define __NR_times 153
+#define __NR_setpgid 154
+#define __NR_getpgid 155
+#define __NR_getsid 156
+#define __NR_setsid 157
+#define __NR_getgroups 158
+#define __NR_setgroups 159
+#define __NR_uname 160
+#define __NR_sethostname 161
+#define __NR_setdomainname 162
+#define __NR_getrlimit 163
+#define __NR_setrlimit 164
+#define __NR_getrusage 165
+#define __NR_umask 166
+#define __NR_prctl 167
+#define __NR_getcpu 168
+#define __NR_gettimeofday 169
+#define __NR_settimeofday 170
+#define __NR_adjtimex 171
+#define __NR_getpid 172
+#define __NR_getppid 173
+#define __NR_getuid 174
+#define __NR_geteuid 175
+#define __NR_getgid 176
+#define __NR_getegid 177
+#define __NR_gettid 178
+#define __NR_sysinfo 179
+#define __NR_mq_open 180
+#define __NR_mq_unlink 181
+#define __NR_mq_timedsend 182
+#define __NR_mq_timedreceive 183
+#define __NR_mq_notify 184
+#define __NR_mq_getsetattr 185
+#define __NR_msgget 186
+#define __NR_msgctl 187
+#define __NR_msgrcv 188
+#define __NR_msgsnd 189
+#define __NR_semget 190
+#define __NR_semctl 191
+#define __NR_semtimedop 192
+#define __NR_semop 193
+#define __NR_shmget 194
+#define __NR_shmctl 195
+#define __NR_shmat 196
+#define __NR_shmdt 197
+#define __NR_socket 198
+#define __NR_socketpair 199
+#define __NR_bind 200
+#define __NR_listen 201
+#define __NR_accept 202
+#define __NR_connect 203
+#define __NR_getsockname 204
+#define __NR_getpeername 205
+#define __NR_sendto 206
+#define __NR_recvfrom 207
+#define __NR_setsockopt 208
+#define __NR_getsockopt 209
+#define __NR_shutdown 210
+#define __NR_sendmsg 211
+#define __NR_recvmsg 212
+#define __NR_readahead 213
+#define __NR_brk 214
+#define __NR_munmap 215
+#define __NR_mremap 216
+#define __NR_add_key 217
+#define __NR_request_key 218
+#define __NR_keyctl 219
+#define __NR_clone 220
+#define __NR_execve 221
+#define __NR_mmap2 222
+#define __NR_fadvise64_64 223
+#define __NR_swapon 224
+#define __NR_swapoff 225
+#define __NR_mprotect 226
+#define __NR_msync 227
+#define __NR_mlock 228
+#define __NR_munlock 229
+#define __NR_mlockall 230
+#define __NR_munlockall 231
+#define __NR_mincore 232
+#define __NR_madvise 233
+#define __NR_remap_file_pages 234
+#define __NR_mbind 235
+#define __NR_get_mempolicy 236
+#define __NR_set_mempolicy 237
+#define __NR_migrate_pages 238
+#define __NR_move_pages 239
+#define __NR_rt_tgsigqueueinfo 240
+#define __NR_perf_event_open 241
+#define __NR_accept4 242
+#define __NR_recvmmsg 243
+#define __NR_or1k_atomic 244
+#define __NR_wait4 260
+#define __NR_prlimit64 261
+#define __NR_fanotify_init 262
+#define __NR_fanotify_mark 263
+#define __NR_name_to_handle_at 264
+#define __NR_open_by_handle_at 265
+#define __NR_clock_adjtime 266
+#define __NR_syncfs 267
+#define __NR_setns 268
+#define __NR_sendmmsg 269
+#define __NR_process_vm_readv 270
+#define __NR_process_vm_writev 271
+#define __NR_kcmp 272
+#define __NR_finit_module 273
+#define __NR_sched_setattr 274
+#define __NR_sched_getattr 275
+#define __NR_renameat2 276
+#define __NR_seccomp 277
+#define __NR_getrandom 278
+#define __NR_memfd_create 279
+#define __NR_bpf 280
+#define __NR_execveat 281
+#define __NR_userfaultfd 282
+#define __NR_membarrier 283
+#define __NR_mlock2 284
+#define __NR_copy_file_range 285
+
diff --git a/arch/powerpc/bits/syscall.h b/arch/powerpc/bits/syscall.h.in
index eb5295f6..f55e69c5 100644
--- a/arch/powerpc/bits/syscall.h
+++ b/arch/powerpc/bits/syscall.h.in
@@ -370,377 +370,3 @@
 #define __NR_mlock2                378
 #define __NR_copy_file_range       379
 
-/*
- * repeated with SYS prefix
- */
-#define SYS_restart_syscall          0
-#define SYS_exit                     1
-#define SYS_fork                     2
-#define SYS_read                     3
-#define SYS_write                    4
-#define SYS_open                     5
-#define SYS_close                    6
-#define SYS_waitpid                  7
-#define SYS_creat                    8
-#define SYS_link                     9
-#define SYS_unlink                  10
-#define SYS_execve                  11
-#define SYS_chdir                   12
-#define SYS_time                    13
-#define SYS_mknod                   14
-#define SYS_chmod                   15
-#define SYS_lchown                  16
-#define SYS_break                   17
-#define SYS_oldstat                 18
-#define SYS_lseek                   19
-#define SYS_getpid                  20
-#define SYS_mount                   21
-#define SYS_umount                  22
-#define SYS_setuid                  23
-#define SYS_getuid                  24
-#define SYS_stime                   25
-#define SYS_ptrace                  26
-#define SYS_alarm                   27
-#define SYS_oldfstat                28
-#define SYS_pause                   29
-#define SYS_utime                   30
-#define SYS_stty                    31
-#define SYS_gtty                    32
-#define SYS_access                  33
-#define SYS_nice                    34
-#define SYS_ftime                   35
-#define SYS_sync                    36
-#define SYS_kill                    37
-#define SYS_rename                  38
-#define SYS_mkdir                   39
-#define SYS_rmdir                   40
-#define SYS_dup                     41
-#define SYS_pipe                    42
-#define SYS_times                   43
-#define SYS_prof                    44
-#define SYS_brk                     45
-#define SYS_setgid                  46
-#define SYS_getgid                  47
-#define SYS_signal                  48
-#define SYS_geteuid                 49
-#define SYS_getegid                 50
-#define SYS_acct                    51
-#define SYS_umount2                 52
-#define SYS_lock                    53
-#define SYS_ioctl                   54
-#define SYS_fcntl                   55
-#define SYS_mpx                     56
-#define SYS_setpgid                 57
-#define SYS_ulimit                  58
-#define SYS_oldolduname             59
-#define SYS_umask                   60
-#define SYS_chroot                  61
-#define SYS_ustat                   62
-#define SYS_dup2                    63
-#define SYS_getppid                 64
-#define SYS_getpgrp                 65
-#define SYS_setsid                  66
-#define SYS_sigaction               67
-#define SYS_sgetmask                68
-#define SYS_ssetmask                69
-#define SYS_setreuid                70
-#define SYS_setregid                71
-#define SYS_sigsuspend              72
-#define SYS_sigpending              73
-#define SYS_sethostname             74
-#define SYS_setrlimit               75
-#define SYS_getrlimit               76
-#define SYS_getrusage               77
-#define SYS_gettimeofday            78
-#define SYS_settimeofday            79
-#define SYS_getgroups               80
-#define SYS_setgroups               81
-#define SYS_select                  82
-#define SYS_symlink                 83
-#define SYS_oldlstat                84
-#define SYS_readlink                85
-#define SYS_uselib                  86
-#define SYS_swapon                  87
-#define SYS_reboot                  88
-#define SYS_readdir                 89
-#define SYS_mmap                    90
-#define SYS_munmap                  91
-#define SYS_truncate                92
-#define SYS_ftruncate               93
-#define SYS_fchmod                  94
-#define SYS_fchown                  95
-#define SYS_getpriority             96
-#define SYS_setpriority             97
-#define SYS_profil                  98
-#define SYS_statfs                  99
-#define SYS_fstatfs                100
-#define SYS_ioperm                 101
-#define SYS_socketcall             102
-#define SYS_syslog                 103
-#define SYS_setitimer              104
-#define SYS_getitimer              105
-#define SYS_stat                   106
-#define SYS_lstat                  107
-#define SYS_fstat                  108
-#define SYS_olduname               109
-#define SYS_iopl                   110
-#define SYS_vhangup                111
-#define SYS_idle                   112
-#define SYS_vm86                   113
-#define SYS_wait4                  114
-#define SYS_swapoff                115
-#define SYS_sysinfo                116
-#define SYS_ipc                    117
-#define SYS_fsync                  118
-#define SYS_sigreturn              119
-#define SYS_clone                  120
-#define SYS_setdomainname          121
-#define SYS_uname                  122
-#define SYS_modify_ldt             123
-#define SYS_adjtimex               124
-#define SYS_mprotect               125
-#define SYS_sigprocmask            126
-#define SYS_create_module          127
-#define SYS_init_module            128
-#define SYS_delete_module          129
-#define SYS_get_kernel_syms        130
-#define SYS_quotactl               131
-#define SYS_getpgid                132
-#define SYS_fchdir                 133
-#define SYS_bdflush                134
-#define SYS_sysfs                  135
-#define SYS_personality            136
-#define SYS_afs_syscall            137
-#define SYS_setfsuid               138
-#define SYS_setfsgid               139
-#define SYS__llseek                140
-#define SYS_getdents               141
-#define SYS__newselect             142
-#define SYS_flock                  143
-#define SYS_msync                  144
-#define SYS_readv                  145
-#define SYS_writev                 146
-#define SYS_getsid                 147
-#define SYS_fdatasync              148
-#define SYS__sysctl                149
-#define SYS_mlock                  150
-#define SYS_munlock                151
-#define SYS_mlockall               152
-#define SYS_munlockall             153
-#define SYS_sched_setparam         154
-#define SYS_sched_getparam         155
-#define SYS_sched_setscheduler     156
-#define SYS_sched_getscheduler     157
-#define SYS_sched_yield            158
-#define SYS_sched_get_priority_max 159
-#define SYS_sched_get_priority_min 160
-#define SYS_sched_rr_get_interval  161
-#define SYS_nanosleep              162
-#define SYS_mremap                 163
-#define SYS_setresuid32            164
-#define SYS_setresuid              164
-#define SYS_getresuid32            165
-#define SYS_getresuid              165
-#define SYS_query_module           166
-#define SYS_poll                   167
-#define SYS_nfsservctl             168
-#define SYS_setresgid32            169
-#define SYS_setresgid              169
-#define SYS_getresgid32            170
-#define SYS_getresgid              170
-#define SYS_prctl                  171
-#define SYS_rt_sigreturn           172
-#define SYS_rt_sigaction           173
-#define SYS_rt_sigprocmask         174
-#define SYS_rt_sigpending          175
-#define SYS_rt_sigtimedwait        176
-#define SYS_rt_sigqueueinfo        177
-#define SYS_rt_sigsuspend          178
-#define SYS_pread64                179
-#define SYS_pwrite64               180
-#define SYS_chown                  181
-#define SYS_getcwd                 182
-#define SYS_capget                 183
-#define SYS_capset                 184
-#define SYS_sigaltstack            185
-#define SYS_sendfile               186
-#define SYS_getpmsg                187
-#define SYS_putpmsg                188
-#define SYS_vfork                  189
-#define SYS_ugetrlimit             190
-#define SYS_readahead              191
-#define SYS_mmap2                  192
-#define SYS_truncate64             193
-#define SYS_ftruncate64            194
-#define SYS_stat64                 195
-#define SYS_lstat64                196
-#define SYS_fstat64                197
-#define SYS_pciconfig_read         198
-#define SYS_pciconfig_write        199
-#define SYS_pciconfig_iobase       200
-#define SYS_multiplexer            201
-#define SYS_getdents64             202
-#define SYS_pivot_root             203
-#define SYS_fcntl64                204
-#define SYS_madvise                205
-#define SYS_mincore                206
-#define SYS_gettid                 207
-#define SYS_tkill                  208
-#define SYS_setxattr               209
-#define SYS_lsetxattr              210
-#define SYS_fsetxattr              211
-#define SYS_getxattr               212
-#define SYS_lgetxattr              213
-#define SYS_fgetxattr              214
-#define SYS_listxattr              215
-#define SYS_llistxattr             216
-#define SYS_flistxattr             217
-#define SYS_removexattr            218
-#define SYS_lremovexattr           219
-#define SYS_fremovexattr           220
-#define SYS_futex                  221
-#define SYS_sched_setaffinity      222
-#define SYS_sched_getaffinity      223
-#define SYS_tuxcall                225
-#define SYS_sendfile64             226
-#define SYS_io_setup               227
-#define SYS_io_destroy             228
-#define SYS_io_getevents           229
-#define SYS_io_submit              230
-#define SYS_io_cancel              231
-#define SYS_set_tid_address        232
-#define SYS_fadvise64              233
-#define SYS_exit_group             234
-#define SYS_lookup_dcookie         235
-#define SYS_epoll_create           236
-#define SYS_epoll_ctl              237
-#define SYS_epoll_wait             238
-#define SYS_remap_file_pages       239
-#define SYS_timer_create           240
-#define SYS_timer_settime          241
-#define SYS_timer_gettime          242
-#define SYS_timer_getoverrun       243
-#define SYS_timer_delete           244
-#define SYS_clock_settime          245
-#define SYS_clock_gettime          246
-#define SYS_clock_getres           247
-#define SYS_clock_nanosleep        248
-#define SYS_swapcontext            249
-#define SYS_tgkill                 250
-#define SYS_utimes                 251
-#define SYS_statfs64               252
-#define SYS_fstatfs64              253
-#define SYS_fadvise64_64           254
-#define SYS_rtas		255
-#define SYS_sys_debug_setcontext 256
-#define SYS_migrate_pages	258
-#define SYS_mbind		259
-#define SYS_get_mempolicy	260
-#define SYS_set_mempolicy	261
-#define SYS_mq_open		262
-#define SYS_mq_unlink		263
-#define SYS_mq_timedsend	264
-#define SYS_mq_timedreceive	265
-#define SYS_mq_notify		266
-#define SYS_mq_getsetattr	267
-#define SYS_kexec_load		268
-#define SYS_add_key		269
-#define SYS_request_key	270
-#define SYS_keyctl		271
-#define SYS_waitid		272
-#define SYS_ioprio_set		273
-#define SYS_ioprio_get		274
-#define SYS_inotify_init	275
-#define SYS_inotify_add_watch	276
-#define SYS_inotify_rm_watch	277
-#define SYS_spu_run		278
-#define SYS_spu_create		279
-#define SYS_pselect6		280
-#define SYS_ppoll		281
-#define SYS_unshare		282
-#define SYS_splice		283
-#define SYS_tee		284
-#define SYS_vmsplice		285
-#define SYS_openat		286
-#define SYS_mkdirat		287
-#define SYS_mknodat		288
-#define SYS_fchownat		289
-#define SYS_futimesat		290
-#define SYS_fstatat64		291
-#define SYS_unlinkat		292
-#define SYS_renameat		293
-#define SYS_linkat		294
-#define SYS_symlinkat		295
-#define SYS_readlinkat		296
-#define SYS_fchmodat		297
-#define SYS_faccessat		298
-#define SYS_get_robust_list	299
-#define SYS_set_robust_list	300
-#define SYS_move_pages		301
-#define SYS_getcpu		302
-#define SYS_epoll_pwait	303
-#define SYS_utimensat		304
-#define SYS_signalfd		305
-#define SYS_timerfd		306
-#define SYS_timerfd_create      306
-#define SYS_eventfd		307
-#define SYS_sync_file_range2	308
-#define SYS_fallocate		309
-#define SYS_subpage_prot		310
-#define SYS_timerfd_settime	311
-#define SYS_timerfd_gettime	312
-#define SYS_signalfd4		313
-#define SYS_eventfd2		314
-#define SYS_epoll_create1	315
-#define SYS_dup3			316
-#define SYS_pipe2		317
-#define SYS_inotify_init1	318
-#define SYS_perf_event_open       319
-#define SYS_preadv                320
-#define SYS_pwritev               321
-#define SYS_rt_tgsigqueueinfo     322
-#define SYS_fanotify_init         323
-#define SYS_fanotify_mark         324
-#define SYS_prlimit64             325
-#define SYS_socket                326
-#define SYS_bind                  327
-#define SYS_connect               328
-#define SYS_listen                329
-#define SYS_accept                330
-#define SYS_getsockname           331
-#define SYS_getpeername           332
-#define SYS_socketpair            333
-#define SYS_send                  334
-#define SYS_sendto                335
-#define SYS_recv                  336
-#define SYS_recvfrom              337
-#define SYS_shutdown              338
-#define SYS_setsockopt            339
-#define SYS_getsockopt            340
-#define SYS_sendmsg               341
-#define SYS_recvmsg               342
-#define SYS_recvmmsg              343
-#define SYS_accept4               344
-#define SYS_name_to_handle_at     345
-#define SYS_open_by_handle_at     346
-#define SYS_clock_adjtime         347
-#define SYS_syncfs                348
-#define SYS_sendmmsg              349
-#define SYS_setns                 350
-#define SYS_process_vm_readv      351
-#define SYS_process_vm_writev     352
-#define SYS_finit_module          353
-#define SYS_kcmp                  354
-#define SYS_sched_setattr         355
-#define SYS_sched_getattr         356
-#define SYS_renameat2             357
-#define SYS_seccomp               358
-#define SYS_getrandom             359
-#define SYS_memfd_create          360
-#define SYS_bpf                   361
-#define SYS_execveat              362
-#define SYS_switch_endian         363
-#define SYS_userfaultfd           364
-#define SYS_membarrier            365
-#define SYS_mlock2                378
-#define SYS_copy_file_range       379
diff --git a/arch/powerpc64/bits/syscall.h b/arch/powerpc64/bits/syscall.h.in
index 1c5c2ea8..ff375364 100644
--- a/arch/powerpc64/bits/syscall.h
+++ b/arch/powerpc64/bits/syscall.h.in
@@ -356,363 +356,3 @@
 #define __NR_mlock2                 378
 #define __NR_copy_file_range        379
 
-/*
- * repeated with SYS prefix
- */
-#define SYS_restart_syscall          0
-#define SYS_exit                     1
-#define SYS_fork                     2
-#define SYS_read                     3
-#define SYS_write                    4
-#define SYS_open                     5
-#define SYS_close                    6
-#define SYS_waitpid                  7
-#define SYS_creat                    8
-#define SYS_link                     9
-#define SYS_unlink                  10
-#define SYS_execve                  11
-#define SYS_chdir                   12
-#define SYS_time                    13
-#define SYS_mknod                   14
-#define SYS_chmod                   15
-#define SYS_lchown                  16
-#define SYS_break                   17
-#define SYS_oldstat                 18
-#define SYS_lseek                   19
-#define SYS_getpid                  20
-#define SYS_mount                   21
-#define SYS_umount                  22
-#define SYS_setuid                  23
-#define SYS_getuid                  24
-#define SYS_stime                   25
-#define SYS_ptrace                  26
-#define SYS_alarm                   27
-#define SYS_oldfstat                28
-#define SYS_pause                   29
-#define SYS_utime                   30
-#define SYS_stty                    31
-#define SYS_gtty                    32
-#define SYS_access                  33
-#define SYS_nice                    34
-#define SYS_ftime                   35
-#define SYS_sync                    36
-#define SYS_kill                    37
-#define SYS_rename                  38
-#define SYS_mkdir                   39
-#define SYS_rmdir                   40
-#define SYS_dup                     41
-#define SYS_pipe                    42
-#define SYS_times                   43
-#define SYS_prof                    44
-#define SYS_brk                     45
-#define SYS_setgid                  46
-#define SYS_getgid                  47
-#define SYS_signal                  48
-#define SYS_geteuid                 49
-#define SYS_getegid                 50
-#define SYS_acct                    51
-#define SYS_umount2                 52
-#define SYS_lock                    53
-#define SYS_ioctl                   54
-#define SYS_fcntl                   55
-#define SYS_mpx                     56
-#define SYS_setpgid                 57
-#define SYS_ulimit                  58
-#define SYS_oldolduname             59
-#define SYS_umask                   60
-#define SYS_chroot                  61
-#define SYS_ustat                   62
-#define SYS_dup2                    63
-#define SYS_getppid                 64
-#define SYS_getpgrp                 65
-#define SYS_setsid                  66
-#define SYS_sigaction               67
-#define SYS_sgetmask                68
-#define SYS_ssetmask                69
-#define SYS_setreuid                70
-#define SYS_setregid                71
-#define SYS_sigsuspend              72
-#define SYS_sigpending              73
-#define SYS_sethostname             74
-#define SYS_setrlimit               75
-#define SYS_getrlimit               76
-#define SYS_getrusage               77
-#define SYS_gettimeofday            78
-#define SYS_settimeofday            79
-#define SYS_getgroups               80
-#define SYS_setgroups               81
-#define SYS_select                  82
-#define SYS_symlink                 83
-#define SYS_oldlstat                84
-#define SYS_readlink                85
-#define SYS_uselib                  86
-#define SYS_swapon                  87
-#define SYS_reboot                  88
-#define SYS_readdir                 89
-#define SYS_mmap                    90
-#define SYS_munmap                  91
-#define SYS_truncate                92
-#define SYS_ftruncate               93
-#define SYS_fchmod                  94
-#define SYS_fchown                  95
-#define SYS_getpriority             96
-#define SYS_setpriority             97
-#define SYS_profil                  98
-#define SYS_statfs                  99
-#define SYS_fstatfs                100
-#define SYS_ioperm                 101
-#define SYS_socketcall             102
-#define SYS_syslog                 103
-#define SYS_setitimer              104
-#define SYS_getitimer              105
-#define SYS_stat                   106
-#define SYS_lstat                  107
-#define SYS_fstat                  108
-#define SYS_olduname               109
-#define SYS_iopl                   110
-#define SYS_vhangup                111
-#define SYS_idle                   112
-#define SYS_vm86                   113
-#define SYS_wait4                  114
-#define SYS_swapoff                115
-#define SYS_sysinfo                116
-#define SYS_ipc                    117
-#define SYS_fsync                  118
-#define SYS_sigreturn              119
-#define SYS_clone                  120
-#define SYS_setdomainname          121
-#define SYS_uname                  122
-#define SYS_modify_ldt             123
-#define SYS_adjtimex               124
-#define SYS_mprotect               125
-#define SYS_sigprocmask            126
-#define SYS_create_module          127
-#define SYS_init_module            128
-#define SYS_delete_module          129
-#define SYS_get_kernel_syms        130
-#define SYS_quotactl               131
-#define SYS_getpgid                132
-#define SYS_fchdir                 133
-#define SYS_bdflush                134
-#define SYS_sysfs                  135
-#define SYS_personality            136
-#define SYS_afs_syscall            137
-#define SYS_setfsuid               138
-#define SYS_setfsgid               139
-#define SYS__llseek                140
-#define SYS_getdents               141
-#define SYS__newselect             142
-#define SYS_flock                  143
-#define SYS_msync                  144
-#define SYS_readv                  145
-#define SYS_writev                 146
-#define SYS_getsid                 147
-#define SYS_fdatasync              148
-#define SYS__sysctl                149
-#define SYS_mlock                  150
-#define SYS_munlock                151
-#define SYS_mlockall               152
-#define SYS_munlockall             153
-#define SYS_sched_setparam         154
-#define SYS_sched_getparam         155
-#define SYS_sched_setscheduler     156
-#define SYS_sched_getscheduler     157
-#define SYS_sched_yield            158
-#define SYS_sched_get_priority_max 159
-#define SYS_sched_get_priority_min 160
-#define SYS_sched_rr_get_interval  161
-#define SYS_nanosleep              162
-#define SYS_mremap                 163
-#define SYS_setresuid              164
-#define SYS_getresuid              165
-#define SYS_query_module           166
-#define SYS_poll                   167
-#define SYS_nfsservctl             168
-#define SYS_setresgid              169
-#define SYS_getresgid              170
-#define SYS_prctl                  171
-#define SYS_rt_sigreturn           172
-#define SYS_rt_sigaction           173
-#define SYS_rt_sigprocmask         174
-#define SYS_rt_sigpending          175
-#define SYS_rt_sigtimedwait        176
-#define SYS_rt_sigqueueinfo        177
-#define SYS_rt_sigsuspend          178
-#define SYS_pread64                179
-#define SYS_pwrite64               180
-#define SYS_chown                  181
-#define SYS_getcwd                 182
-#define SYS_capget                 183
-#define SYS_capset                 184
-#define SYS_sigaltstack            185
-#define SYS_sendfile               186
-#define SYS_getpmsg                187
-#define SYS_putpmsg                188
-#define SYS_vfork                  189
-#define SYS_ugetrlimit             190
-#define SYS_readahead              191
-#define SYS_pciconfig_read         198
-#define SYS_pciconfig_write        199
-#define SYS_pciconfig_iobase       200
-#define SYS_multiplexer            201
-#define SYS_getdents64             202
-#define SYS_pivot_root             203
-#define SYS_madvise                205
-#define SYS_mincore                206
-#define SYS_gettid                 207
-#define SYS_tkill                  208
-#define SYS_setxattr               209
-#define SYS_lsetxattr              210
-#define SYS_fsetxattr              211
-#define SYS_getxattr               212
-#define SYS_lgetxattr              213
-#define SYS_fgetxattr              214
-#define SYS_listxattr              215
-#define SYS_llistxattr             216
-#define SYS_flistxattr             217
-#define SYS_removexattr            218
-#define SYS_lremovexattr           219
-#define SYS_fremovexattr           220
-#define SYS_futex                  221
-#define SYS_sched_setaffinity      222
-#define SYS_sched_getaffinity      223
-#define SYS_tuxcall                225
-#define SYS_io_setup               227
-#define SYS_io_destroy             228
-#define SYS_io_getevents           229
-#define SYS_io_submit              230
-#define SYS_io_cancel              231
-#define SYS_set_tid_address        232
-#define SYS_fadvise64              233
-#define SYS_exit_group             234
-#define SYS_lookup_dcookie         235
-#define SYS_epoll_create           236
-#define SYS_epoll_ctl              237
-#define SYS_epoll_wait             238
-#define SYS_remap_file_pages       239
-#define SYS_timer_create           240
-#define SYS_timer_settime          241
-#define SYS_timer_gettime          242
-#define SYS_timer_getoverrun       243
-#define SYS_timer_delete           244
-#define SYS_clock_settime          245
-#define SYS_clock_gettime          246
-#define SYS_clock_getres           247
-#define SYS_clock_nanosleep        248
-#define SYS_swapcontext            249
-#define SYS_tgkill                 250
-#define SYS_utimes                 251
-#define SYS_statfs64               252
-#define SYS_fstatfs64              253
-#define SYS_rtas                   255
-#define SYS_sys_debug_setcontext   256
-#define SYS_migrate_pages          258
-#define SYS_mbind                  259
-#define SYS_get_mempolicy          260
-#define SYS_set_mempolicy          261
-#define SYS_mq_open                262
-#define SYS_mq_unlink              263
-#define SYS_mq_timedsend           264
-#define SYS_mq_timedreceive        265
-#define SYS_mq_notify              266
-#define SYS_mq_getsetattr          267
-#define SYS_kexec_load             268
-#define SYS_add_key                269
-#define SYS_request_key            270
-#define SYS_keyctl                 271
-#define SYS_waitid                 272
-#define SYS_ioprio_set             273
-#define SYS_ioprio_get             274
-#define SYS_inotify_init           275
-#define SYS_inotify_add_watch      276
-#define SYS_inotify_rm_watch       277
-#define SYS_spu_run                278
-#define SYS_spu_create             279
-#define SYS_pselect6               280
-#define SYS_ppoll                  281
-#define SYS_unshare                282
-#define SYS_splice                 283
-#define SYS_tee                    284
-#define SYS_vmsplice               285
-#define SYS_openat                 286
-#define SYS_mkdirat                287
-#define SYS_mknodat                288
-#define SYS_fchownat               289
-#define SYS_futimesat              290
-#define SYS_newfstatat             291
-#define SYS_unlinkat               292
-#define SYS_renameat               293
-#define SYS_linkat                 294
-#define SYS_symlinkat              295
-#define SYS_readlinkat             296
-#define SYS_fchmodat               297
-#define SYS_faccessat              298
-#define SYS_get_robust_list        299
-#define SYS_set_robust_list        300
-#define SYS_move_pages             301
-#define SYS_getcpu                 302
-#define SYS_epoll_pwait            303
-#define SYS_utimensat              304
-#define SYS_signalfd               305
-#define SYS_timerfd_create         306
-#define SYS_eventfd                307
-#define SYS_sync_file_range2       308
-#define SYS_fallocate              309
-#define SYS_subpage_prot           310
-#define SYS_timerfd_settime        311
-#define SYS_timerfd_gettime        312
-#define SYS_signalfd4              313
-#define SYS_eventfd2               314
-#define SYS_epoll_create1          315
-#define SYS_dup3                   316
-#define SYS_pipe2                  317
-#define SYS_inotify_init1          318
-#define SYS_perf_event_open        319
-#define SYS_preadv                 320
-#define SYS_pwritev                321
-#define SYS_rt_tgsigqueueinfo      322
-#define SYS_fanotify_init          323
-#define SYS_fanotify_mark          324
-#define SYS_prlimit64              325
-#define SYS_socket                 326
-#define SYS_bind                   327
-#define SYS_connect                328
-#define SYS_listen                 329
-#define SYS_accept                 330
-#define SYS_getsockname            331
-#define SYS_getpeername            332
-#define SYS_socketpair             333
-#define SYS_send                   334
-#define SYS_sendto                 335
-#define SYS_recv                   336
-#define SYS_recvfrom               337
-#define SYS_shutdown               338
-#define SYS_setsockopt             339
-#define SYS_getsockopt             340
-#define SYS_sendmsg                341
-#define SYS_recvmsg                342
-#define SYS_recvmmsg               343
-#define SYS_accept4                344
-#define SYS_name_to_handle_at      345
-#define SYS_open_by_handle_at      346
-#define SYS_clock_adjtime          347
-#define SYS_syncfs                 348
-#define SYS_sendmmsg               349
-#define SYS_setns                  350
-#define SYS_process_vm_readv       351
-#define SYS_process_vm_writev      352
-#define SYS_finit_module           353
-#define SYS_kcmp                   354
-#define SYS_sched_setattr          355
-#define SYS_sched_getattr          356
-#define SYS_renameat2              357
-#define SYS_seccomp                358
-#define SYS_getrandom              359
-#define SYS_memfd_create           360
-#define SYS_bpf                    361
-#define SYS_execveat               362
-#define SYS_switch_endian          363
-#define SYS_userfaultfd            364
-#define SYS_membarrier             365
-#define SYS_mlock2                 378
-#define SYS_copy_file_range        379
diff --git a/arch/sh/bits/syscall.h b/arch/sh/bits/syscall.h
deleted file mode 100644
index 4b363bf2..00000000
--- a/arch/sh/bits/syscall.h
+++ /dev/null
@@ -1,684 +0,0 @@
-#define __NR_restart_syscall        0
-#define __NR_exit                   1
-#define __NR_fork                   2
-#define __NR_read                   3
-#define __NR_write                  4
-#define __NR_open                   5
-#define __NR_close                  6
-#define __NR_waitpid                7
-#define __NR_creat                  8
-#define __NR_link                   9
-#define __NR_unlink                 10
-#define __NR_execve                 11
-#define __NR_chdir                  12
-#define __NR_time                   13
-#define __NR_mknod                  14
-#define __NR_chmod                  15
-#define __NR_lchown                 16
-#define __NR_oldstat                18
-#define __NR_lseek                  19
-#define __NR_getpid                 20
-#define __NR_mount                  21
-#define __NR_umount                 22
-#define __NR_setuid                 23
-#define __NR_getuid                 24
-#define __NR_stime                  25
-#define __NR_ptrace                 26
-#define __NR_alarm                  27
-#define __NR_oldfstat               28
-#define __NR_pause                  29
-#define __NR_utime                  30
-#define __NR_access                 33
-#define __NR_nice                   34
-#define __NR_sync                   36
-#define __NR_kill                   37
-#define __NR_rename                 38
-#define __NR_mkdir                  39
-#define __NR_rmdir                  40
-#define __NR_dup                    41
-#define __NR_pipe                   42
-#define __NR_times                  43
-#define __NR_brk                    45
-#define __NR_setgid                 46
-#define __NR_getgid                 47
-#define __NR_signal                 48
-#define __NR_geteuid                49
-#define __NR_getegid                50
-#define __NR_acct                   51
-#define __NR_umount2                52
-#define __NR_ioctl                  54
-#define __NR_fcntl                  55
-#define __NR_setpgid                57
-#define __NR_umask                  60
-#define __NR_chroot                 61
-#define __NR_ustat                  62
-#define __NR_dup2                   63
-#define __NR_getppid                64
-#define __NR_getpgrp                65
-#define __NR_setsid                 66
-#define __NR_sigaction              67
-#define __NR_sgetmask               68
-#define __NR_ssetmask               69
-#define __NR_setreuid               70
-#define __NR_setregid               71
-#define __NR_sigsuspend             72
-#define __NR_sigpending             73
-#define __NR_sethostname            74
-#define __NR_setrlimit              75
-#define __NR_getrlimit              76
-#define __NR_getrusage              77
-#define __NR_gettimeofday           78
-#define __NR_settimeofday           79
-#define __NR_getgroups              80
-#define __NR_setgroups              81
-#define __NR_symlink                83
-#define __NR_oldlstat               84
-#define __NR_readlink               85
-#define __NR_uselib                 86
-#define __NR_swapon                 87
-#define __NR_reboot                 88
-#define __NR_readdir                89
-#define __NR_mmap                   90
-#define __NR_munmap                 91
-#define __NR_truncate               92
-#define __NR_ftruncate              93
-#define __NR_fchmod                 94
-#define __NR_fchown                 95
-#define __NR_getpriority            96
-#define __NR_setpriority            97
-#define __NR_statfs                 99
-#define __NR_fstatfs                100
-#define __NR_socketcall             102
-#define __NR_syslog                 103
-#define __NR_setitimer              104
-#define __NR_getitimer              105
-#define __NR_stat                   106
-#define __NR_lstat                  107
-#define __NR_fstat                  108
-#define __NR_olduname               109
-#define __NR_vhangup                111
-#define __NR_wait4                  114
-#define __NR_swapoff                115
-#define __NR_sysinfo                116
-#define __NR_ipc                    117
-#define __NR_fsync                  118
-#define __NR_sigreturn              119
-#define __NR_clone                  120
-#define __NR_setdomainname          121
-#define __NR_uname                  122
-#define __NR_cacheflush             123
-#define __NR_adjtimex               124
-#define __NR_mprotect               125
-#define __NR_sigprocmask            126
-#define __NR_init_module            128
-#define __NR_delete_module          129
-#define __NR_quotactl               131
-#define __NR_getpgid                132
-#define __NR_fchdir                 133
-#define __NR_bdflush                134
-#define __NR_sysfs                  135
-#define __NR_personality            136
-#define __NR_setfsuid               138
-#define __NR_setfsgid               139
-#define __NR__llseek                140
-#define __NR_getdents               141
-#define __NR__newselect             142
-#define __NR_flock                  143
-#define __NR_msync                  144
-#define __NR_readv                  145
-#define __NR_writev                 146
-#define __NR_getsid                 147
-#define __NR_fdatasync              148
-#define __NR__sysctl                149
-#define __NR_mlock                  150
-#define __NR_munlock                151
-#define __NR_mlockall               152
-#define __NR_munlockall             153
-#define __NR_sched_setparam         154
-#define __NR_sched_getparam         155
-#define __NR_sched_setscheduler     156
-#define __NR_sched_getscheduler     157
-#define __NR_sched_yield            158
-#define __NR_sched_get_priority_max 159
-#define __NR_sched_get_priority_min 160
-#define __NR_sched_rr_get_interval  161
-#define __NR_nanosleep              162
-#define __NR_mremap                 163
-#define __NR_setresuid              164
-#define __NR_getresuid              165
-#define __NR_poll                   168
-#define __NR_nfsservctl             169
-#define __NR_setresgid              170
-#define __NR_getresgid              171
-#define __NR_prctl                  172
-#define __NR_rt_sigreturn           173
-#define __NR_rt_sigaction           174
-#define __NR_rt_sigprocmask         175
-#define __NR_rt_sigpending          176
-#define __NR_rt_sigtimedwait        177
-#define __NR_rt_sigqueueinfo        178
-#define __NR_rt_sigsuspend          179
-#define __NR_pread64                180
-#define __NR_pwrite64               181
-#define __NR_chown                  182
-#define __NR_getcwd                 183
-#define __NR_capget                 184
-#define __NR_capset                 185
-#define __NR_sigaltstack            186
-#define __NR_sendfile               187
-#define __NR_vfork                  190
-#define __NR_ugetrlimit             191
-#define __NR_mmap2                  192
-#define __NR_truncate64             193
-#define __NR_ftruncate64            194
-#define __NR_stat64                 195
-#define __NR_lstat64                196
-#define __NR_fstat64                197
-#define __NR_lchown32               198
-#define __NR_getuid32               199
-#define __NR_getgid32               200
-#define __NR_geteuid32              201
-#define __NR_getegid32              202
-#define __NR_setreuid32             203
-#define __NR_setregid32             204
-#define __NR_getgroups32            205
-#define __NR_setgroups32            206
-#define __NR_fchown32               207
-#define __NR_setresuid32            208
-#define __NR_getresuid32            209
-#define __NR_setresgid32            210
-#define __NR_getresgid32            211
-#define __NR_chown32                212
-#define __NR_setuid32               213
-#define __NR_setgid32               214
-#define __NR_setfsuid32             215
-#define __NR_setfsgid32             216
-#define __NR_pivot_root             217
-#define __NR_mincore                218
-#define __NR_madvise                219
-#define __NR_getdents64             220
-#define __NR_fcntl64                221
-#define __NR_gettid                 224
-#define __NR_readahead              225
-#define __NR_setxattr               226
-#define __NR_lsetxattr              227
-#define __NR_fsetxattr              228
-#define __NR_getxattr               229
-#define __NR_lgetxattr              230
-#define __NR_fgetxattr              231
-#define __NR_listxattr              232
-#define __NR_llistxattr             233
-#define __NR_flistxattr             234
-#define __NR_removexattr            235
-#define __NR_lremovexattr           236
-#define __NR_fremovexattr           237
-#define __NR_tkill                  238
-#define __NR_sendfile64             239
-#define __NR_futex                  240
-#define __NR_sched_setaffinity      241
-#define __NR_sched_getaffinity      242
-#define __NR_io_setup               245
-#define __NR_io_destroy             246
-#define __NR_io_getevents           247
-#define __NR_io_submit              248
-#define __NR_io_cancel              249
-#define __NR_fadvise64              250
-#define __NR_exit_group             252
-#define __NR_lookup_dcookie         253
-#define __NR_epoll_create           254
-#define __NR_epoll_ctl              255
-#define __NR_epoll_wait             256
-#define __NR_remap_file_pages       257
-#define __NR_set_tid_address        258
-#define __NR_timer_create           259
-#define __NR_timer_settime          260
-#define __NR_timer_gettime          261
-#define __NR_timer_getoverrun       262
-#define __NR_timer_delete           263
-#define __NR_clock_settime          264
-#define __NR_clock_gettime          265
-#define __NR_clock_getres           266
-#define __NR_clock_nanosleep        267
-#define __NR_statfs64               268
-#define __NR_fstatfs64              269
-#define __NR_tgkill                 270
-#define __NR_utimes                 271
-#define __NR_fadvise64_64           272
-#define __NR_mbind                  274
-#define __NR_get_mempolicy          275
-#define __NR_set_mempolicy          276
-#define __NR_mq_open                277
-#define __NR_mq_unlink              278
-#define __NR_mq_timedsend           279
-#define __NR_mq_timedreceive        280
-#define __NR_mq_notify              281
-#define __NR_mq_getsetattr          282
-#define __NR_kexec_load             283
-#define __NR_waitid                 284
-#define __NR_add_key                285
-#define __NR_request_key            286
-#define __NR_keyctl                 287
-#define __NR_ioprio_set             288
-#define __NR_ioprio_get             289
-#define __NR_inotify_init           290
-#define __NR_inotify_add_watch      291
-#define __NR_inotify_rm_watch       292
-#define __NR_migrate_pages          294
-#define __NR_openat                 295
-#define __NR_mkdirat                296
-#define __NR_mknodat                297
-#define __NR_fchownat               298
-#define __NR_futimesat              299
-#define __NR_fstatat64              300
-#define __NR_unlinkat               301
-#define __NR_renameat               302
-#define __NR_linkat                 303
-#define __NR_symlinkat              304
-#define __NR_readlinkat             305
-#define __NR_fchmodat               306
-#define __NR_faccessat              307
-#define __NR_pselect6               308
-#define __NR_ppoll                  309
-#define __NR_unshare                310
-#define __NR_set_robust_list        311
-#define __NR_get_robust_list        312
-#define __NR_splice                 313
-#define __NR_sync_file_range        314
-#define __NR_tee                    315
-#define __NR_vmsplice               316
-#define __NR_move_pages             317
-#define __NR_getcpu                 318
-#define __NR_epoll_pwait            319
-#define __NR_utimensat              320
-#define __NR_signalfd               321
-#define __NR_timerfd_create         322
-#define __NR_eventfd                323
-#define __NR_fallocate              324
-#define __NR_timerfd_settime        325
-#define __NR_timerfd_gettime        326
-#define __NR_signalfd4              327
-#define __NR_eventfd2               328
-#define __NR_epoll_create1          329
-#define __NR_dup3                   330
-#define __NR_pipe2                  331
-#define __NR_inotify_init1          332
-#define __NR_preadv                 333
-#define __NR_pwritev                334
-#define __NR_rt_tgsigqueueinfo      335
-#define __NR_perf_event_open        336
-#define __NR_fanotify_init          337
-#define __NR_fanotify_mark          338
-#define __NR_prlimit64              339
-#define __NR_socket                 340
-#define __NR_bind                   341
-#define __NR_connect                342
-#define __NR_listen                 343
-#define __NR_accept                 344
-#define __NR_getsockname            345
-#define __NR_getpeername            346
-#define __NR_socketpair             347
-#define __NR_send                   348
-#define __NR_sendto                 349
-#define __NR_recv                   350
-#define __NR_recvfrom               351
-#define __NR_shutdown               352
-#define __NR_setsockopt             353
-#define __NR_getsockopt             354
-#define __NR_sendmsg                355
-#define __NR_recvmsg                356
-#define __NR_recvmmsg               357
-#define __NR_accept4                358
-#define __NR_name_to_handle_at      359
-#define __NR_open_by_handle_at      360
-#define __NR_clock_adjtime          361
-#define __NR_syncfs                 362
-#define __NR_sendmmsg               363
-#define __NR_setns                  364
-#define __NR_process_vm_readv       365
-#define __NR_process_vm_writev      366
-#define __NR_kcmp                   367
-#define __NR_finit_module           368
-
-
-/* Repeated with SYS_ prefix */
-
-#define SYS_restart_syscall         0
-#define SYS_exit                    1
-#define SYS_fork                    2
-#define SYS_read                    3
-#define SYS_write                   4
-#define SYS_open                    5
-#define SYS_close                   6
-#define SYS_waitpid                 7
-#define SYS_creat                   8
-#define SYS_link                    9
-#define SYS_unlink                  10
-#define SYS_execve                  11
-#define SYS_chdir                   12
-#define SYS_time                    13
-#define SYS_mknod                   14
-#define SYS_chmod                   15
-#define SYS_lchown                  16
-#define SYS_oldstat                 18
-#define SYS_lseek                   19
-#define SYS_getpid                  20
-#define SYS_mount                   21
-#define SYS_umount                  22
-#define SYS_setuid                  23
-#define SYS_getuid                  24
-#define SYS_stime                   25
-#define SYS_ptrace                  26
-#define SYS_alarm                   27
-#define SYS_oldfstat                28
-#define SYS_pause                   29
-#define SYS_utime                   30
-#define SYS_access                  33
-#define SYS_nice                    34
-#define SYS_sync                    36
-#define SYS_kill                    37
-#define SYS_rename                  38
-#define SYS_mkdir                   39
-#define SYS_rmdir                   40
-#define SYS_dup                     41
-#define SYS_pipe                    42
-#define SYS_times                   43
-#define SYS_brk                     45
-#define SYS_setgid                  46
-#define SYS_getgid                  47
-#define SYS_signal                  48
-#define SYS_geteuid                 49
-#define SYS_getegid                 50
-#define SYS_acct                    51
-#define SYS_umount2                 52
-#define SYS_ioctl                   54
-#define SYS_fcntl                   55
-#define SYS_setpgid                 57
-#define SYS_umask                   60
-#define SYS_chroot                  61
-#define SYS_ustat                   62
-#define SYS_dup2                    63
-#define SYS_getppid                 64
-#define SYS_getpgrp                 65
-#define SYS_setsid                  66
-#define SYS_sigaction               67
-#define SYS_sgetmask                68
-#define SYS_ssetmask                69
-#define SYS_setreuid                70
-#define SYS_setregid                71
-#define SYS_sigsuspend              72
-#define SYS_sigpending              73
-#define SYS_sethostname             74
-#define SYS_setrlimit               75
-#define SYS_getrlimit               76
-#define SYS_getrusage               77
-#define SYS_gettimeofday            78
-#define SYS_settimeofday            79
-#define SYS_getgroups               80
-#define SYS_setgroups               81
-#define SYS_symlink                 83
-#define SYS_oldlstat                84
-#define SYS_readlink                85
-#define SYS_uselib                  86
-#define SYS_swapon                  87
-#define SYS_reboot                  88
-#define SYS_readdir                 89
-#define SYS_mmap                    90
-#define SYS_munmap                  91
-#define SYS_truncate                92
-#define SYS_ftruncate               93
-#define SYS_fchmod                  94
-#define SYS_fchown                  95
-#define SYS_getpriority             96
-#define SYS_setpriority             97
-#define SYS_statfs                  99
-#define SYS_fstatfs                 100
-#define SYS_socketcall              102
-#define SYS_syslog                  103
-#define SYS_setitimer               104
-#define SYS_getitimer               105
-#define SYS_stat                    106
-#define SYS_lstat                   107
-#define SYS_fstat                   108
-#define SYS_olduname                109
-#define SYS_vhangup                 111
-#define SYS_wait4                   114
-#define SYS_swapoff                 115
-#define SYS_sysinfo                 116
-#define SYS_ipc                     117
-#define SYS_fsync                   118
-#define SYS_sigreturn               119
-#define SYS_clone                   120
-#define SYS_setdomainname           121
-#define SYS_uname                   122
-#define SYS_cacheflush              123
-#define SYS_adjtimex                124
-#define SYS_mprotect                125
-#define SYS_sigprocmask             126
-#define SYS_init_module             128
-#define SYS_delete_module           129
-#define SYS_quotactl                131
-#define SYS_getpgid                 132
-#define SYS_fchdir                  133
-#define SYS_bdflush                 134
-#define SYS_sysfs                   135
-#define SYS_personality             136
-#define SYS_setfsuid                138
-#define SYS_setfsgid                139
-#define SYS__llseek                 140
-#define SYS_getdents                141
-#define SYS__newselect              142
-#define SYS_flock                   143
-#define SYS_msync                   144
-#define SYS_readv                   145
-#define SYS_writev                  146
-#define SYS_getsid                  147
-#define SYS_fdatasync               148
-#define SYS__sysctl                 149
-#define SYS_mlock                   150
-#define SYS_munlock                 151
-#define SYS_mlockall                152
-#define SYS_munlockall              153
-#define SYS_sched_setparam          154
-#define SYS_sched_getparam          155
-#define SYS_sched_setscheduler      156
-#define SYS_sched_getscheduler      157
-#define SYS_sched_yield             158
-#define SYS_sched_get_priority_max  159
-#define SYS_sched_get_priority_min  160
-#define SYS_sched_rr_get_interval   161
-#define SYS_nanosleep               162
-#define SYS_mremap                  163
-#define SYS_setresuid               164
-#define SYS_getresuid               165
-#define SYS_poll                    168
-#define SYS_nfsservctl              169
-#define SYS_setresgid               170
-#define SYS_getresgid               171
-#define SYS_prctl                   172
-#define SYS_rt_sigreturn            173
-#define SYS_rt_sigaction            174
-#define SYS_rt_sigprocmask          175
-#define SYS_rt_sigpending           176
-#define SYS_rt_sigtimedwait         177
-#define SYS_rt_sigqueueinfo         178
-#define SYS_rt_sigsuspend           179
-#define SYS_pread64                 180
-#define SYS_pwrite64                181
-#define SYS_chown                   182
-#define SYS_getcwd                  183
-#define SYS_capget                  184
-#define SYS_capset                  185
-#define SYS_sigaltstack             186
-#define SYS_sendfile                187
-#define SYS_vfork                   190
-#define SYS_ugetrlimit              191
-#define SYS_mmap2                   192
-#define SYS_truncate64              193
-#define SYS_ftruncate64             194
-#define SYS_stat64                  195
-#define SYS_lstat64                 196
-#define SYS_fstat64                 197
-#define SYS_lchown32                198
-#define SYS_getuid32                199
-#define SYS_getgid32                200
-#define SYS_geteuid32               201
-#define SYS_getegid32               202
-#define SYS_setreuid32              203
-#define SYS_setregid32              204
-#define SYS_getgroups32             205
-#define SYS_setgroups32             206
-#define SYS_fchown32                207
-#define SYS_setresuid32             208
-#define SYS_getresuid32             209
-#define SYS_setresgid32             210
-#define SYS_getresgid32             211
-#define SYS_chown32                 212
-#define SYS_setuid32                213
-#define SYS_setgid32                214
-#define SYS_setfsuid32              215
-#define SYS_setfsgid32              216
-#define SYS_pivot_root              217
-#define SYS_mincore                 218
-#define SYS_madvise                 219
-#define SYS_getdents64              220
-#define SYS_fcntl64                 221
-#define SYS_gettid                  224
-#define SYS_readahead               225
-#define SYS_setxattr                226
-#define SYS_lsetxattr               227
-#define SYS_fsetxattr               228
-#define SYS_getxattr                229
-#define SYS_lgetxattr               230
-#define SYS_fgetxattr               231
-#define SYS_listxattr               232
-#define SYS_llistxattr              233
-#define SYS_flistxattr              234
-#define SYS_removexattr             235
-#define SYS_lremovexattr            236
-#define SYS_fremovexattr            237
-#define SYS_tkill                   238
-#define SYS_sendfile64              239
-#define SYS_futex                   240
-#define SYS_sched_setaffinity       241
-#define SYS_sched_getaffinity       242
-#define SYS_io_setup                245
-#define SYS_io_destroy              246
-#define SYS_io_getevents            247
-#define SYS_io_submit               248
-#define SYS_io_cancel               249
-#define SYS_fadvise64               250
-#define SYS_exit_group              252
-#define SYS_lookup_dcookie          253
-#define SYS_epoll_create            254
-#define SYS_epoll_ctl               255
-#define SYS_epoll_wait              256
-#define SYS_remap_file_pages        257
-#define SYS_set_tid_address         258
-#define SYS_timer_create            259
-#define SYS_timer_settime           260
-#define SYS_timer_gettime           261
-#define SYS_timer_getoverrun        262
-#define SYS_timer_delete            263
-#define SYS_clock_settime           264
-#define SYS_clock_gettime           265
-#define SYS_clock_getres            266
-#define SYS_clock_nanosleep         267
-#define SYS_statfs64                268
-#define SYS_fstatfs64               269
-#define SYS_tgkill                  270
-#define SYS_utimes                  271
-#define SYS_fadvise64_64            272
-#define SYS_mbind                   274
-#define SYS_get_mempolicy           275
-#define SYS_set_mempolicy           276
-#define SYS_mq_open                 277
-#define SYS_mq_unlink               278
-#define SYS_mq_timedsend            279
-#define SYS_mq_timedreceive         280
-#define SYS_mq_notify               281
-#define SYS_mq_getsetattr           282
-#define SYS_kexec_load              283
-#define SYS_waitid                  284
-#define SYS_add_key                 285
-#define SYS_request_key             286
-#define SYS_keyctl                  287
-#define SYS_ioprio_set              288
-#define SYS_ioprio_get              289
-#define SYS_inotify_init            290
-#define SYS_inotify_add_watch       291
-#define SYS_inotify_rm_watch        292
-#define SYS_migrate_pages           294
-#define SYS_openat                  295
-#define SYS_mkdirat                 296
-#define SYS_mknodat                 297
-#define SYS_fchownat                298
-#define SYS_futimesat               299
-#define SYS_fstatat64               300
-#define SYS_unlinkat                301
-#define SYS_renameat                302
-#define SYS_linkat                  303
-#define SYS_symlinkat               304
-#define SYS_readlinkat              305
-#define SYS_fchmodat                306
-#define SYS_faccessat               307
-#define SYS_pselect6                308
-#define SYS_ppoll                   309
-#define SYS_unshare                 310
-#define SYS_set_robust_list         311
-#define SYS_get_robust_list         312
-#define SYS_splice                  313
-#define SYS_sync_file_range         314
-#define SYS_tee                     315
-#define SYS_vmsplice                316
-#define SYS_move_pages              317
-#define SYS_getcpu                  318
-#define SYS_epoll_pwait             319
-#define SYS_utimensat               320
-#define SYS_signalfd                321
-#define SYS_timerfd_create          322
-#define SYS_eventfd                 323
-#define SYS_fallocate               324
-#define SYS_timerfd_settime         325
-#define SYS_timerfd_gettime         326
-#define SYS_signalfd4               327
-#define SYS_eventfd2                328
-#define SYS_epoll_create1           329
-#define SYS_dup3                    330
-#define SYS_pipe2                   331
-#define SYS_inotify_init1           332
-#define SYS_preadv                  333
-#define SYS_pwritev                 334
-#define SYS_rt_tgsigqueueinfo       335
-#define SYS_perf_event_open         336
-#define SYS_fanotify_init           337
-#define SYS_fanotify_mark           338
-#define SYS_prlimit64               339
-#define SYS_socket                  340
-#define SYS_bind                    341
-#define SYS_connect                 342
-#define SYS_listen                  343
-#define SYS_accept                  344
-#define SYS_getsockname             345
-#define SYS_getpeername             346
-#define SYS_socketpair              347
-#define SYS_send                    348
-#define SYS_sendto                  349
-#define SYS_recv                    350
-#define SYS_recvfrom                351
-#define SYS_shutdown                352
-#define SYS_setsockopt              353
-#define SYS_getsockopt              354
-#define SYS_sendmsg                 355
-#define SYS_recvmsg                 356
-#define SYS_recvmmsg                357
-#define SYS_accept4                 358
-#define SYS_name_to_handle_at       359
-#define SYS_open_by_handle_at       360
-#define SYS_clock_adjtime           361
-#define SYS_syncfs                  362
-#define SYS_sendmmsg                363
-#define SYS_setns                   364
-#define SYS_process_vm_readv        365
-#define SYS_process_vm_writev       366
-#define SYS_kcmp                    367
-#define SYS_finit_module            368
diff --git a/arch/sh/bits/syscall.h.in b/arch/sh/bits/syscall.h.in
new file mode 100644
index 00000000..595fc4d2
--- /dev/null
+++ b/arch/sh/bits/syscall.h.in
@@ -0,0 +1,341 @@
+#define __NR_restart_syscall        0
+#define __NR_exit                   1
+#define __NR_fork                   2
+#define __NR_read                   3
+#define __NR_write                  4
+#define __NR_open                   5
+#define __NR_close                  6
+#define __NR_waitpid                7
+#define __NR_creat                  8
+#define __NR_link                   9
+#define __NR_unlink                 10
+#define __NR_execve                 11
+#define __NR_chdir                  12
+#define __NR_time                   13
+#define __NR_mknod                  14
+#define __NR_chmod                  15
+#define __NR_lchown                 16
+#define __NR_oldstat                18
+#define __NR_lseek                  19
+#define __NR_getpid                 20
+#define __NR_mount                  21
+#define __NR_umount                 22
+#define __NR_setuid                 23
+#define __NR_getuid                 24
+#define __NR_stime                  25
+#define __NR_ptrace                 26
+#define __NR_alarm                  27
+#define __NR_oldfstat               28
+#define __NR_pause                  29
+#define __NR_utime                  30
+#define __NR_access                 33
+#define __NR_nice                   34
+#define __NR_sync                   36
+#define __NR_kill                   37
+#define __NR_rename                 38
+#define __NR_mkdir                  39
+#define __NR_rmdir                  40
+#define __NR_dup                    41
+#define __NR_pipe                   42
+#define __NR_times                  43
+#define __NR_brk                    45
+#define __NR_setgid                 46
+#define __NR_getgid                 47
+#define __NR_signal                 48
+#define __NR_geteuid                49
+#define __NR_getegid                50
+#define __NR_acct                   51
+#define __NR_umount2                52
+#define __NR_ioctl                  54
+#define __NR_fcntl                  55
+#define __NR_setpgid                57
+#define __NR_umask                  60
+#define __NR_chroot                 61
+#define __NR_ustat                  62
+#define __NR_dup2                   63
+#define __NR_getppid                64
+#define __NR_getpgrp                65
+#define __NR_setsid                 66
+#define __NR_sigaction              67
+#define __NR_sgetmask               68
+#define __NR_ssetmask               69
+#define __NR_setreuid               70
+#define __NR_setregid               71
+#define __NR_sigsuspend             72
+#define __NR_sigpending             73
+#define __NR_sethostname            74
+#define __NR_setrlimit              75
+#define __NR_getrlimit              76
+#define __NR_getrusage              77
+#define __NR_gettimeofday           78
+#define __NR_settimeofday           79
+#define __NR_getgroups              80
+#define __NR_setgroups              81
+#define __NR_symlink                83
+#define __NR_oldlstat               84
+#define __NR_readlink               85
+#define __NR_uselib                 86
+#define __NR_swapon                 87
+#define __NR_reboot                 88
+#define __NR_readdir                89
+#define __NR_mmap                   90
+#define __NR_munmap                 91
+#define __NR_truncate               92
+#define __NR_ftruncate              93
+#define __NR_fchmod                 94
+#define __NR_fchown                 95
+#define __NR_getpriority            96
+#define __NR_setpriority            97
+#define __NR_statfs                 99
+#define __NR_fstatfs                100
+#define __NR_socketcall             102
+#define __NR_syslog                 103
+#define __NR_setitimer              104
+#define __NR_getitimer              105
+#define __NR_stat                   106
+#define __NR_lstat                  107
+#define __NR_fstat                  108
+#define __NR_olduname               109
+#define __NR_vhangup                111
+#define __NR_wait4                  114
+#define __NR_swapoff                115
+#define __NR_sysinfo                116
+#define __NR_ipc                    117
+#define __NR_fsync                  118
+#define __NR_sigreturn              119
+#define __NR_clone                  120
+#define __NR_setdomainname          121
+#define __NR_uname                  122
+#define __NR_cacheflush             123
+#define __NR_adjtimex               124
+#define __NR_mprotect               125
+#define __NR_sigprocmask            126
+#define __NR_init_module            128
+#define __NR_delete_module          129
+#define __NR_quotactl               131
+#define __NR_getpgid                132
+#define __NR_fchdir                 133
+#define __NR_bdflush                134
+#define __NR_sysfs                  135
+#define __NR_personality            136
+#define __NR_setfsuid               138
+#define __NR_setfsgid               139
+#define __NR__llseek                140
+#define __NR_getdents               141
+#define __NR__newselect             142
+#define __NR_flock                  143
+#define __NR_msync                  144
+#define __NR_readv                  145
+#define __NR_writev                 146
+#define __NR_getsid                 147
+#define __NR_fdatasync              148
+#define __NR__sysctl                149
+#define __NR_mlock                  150
+#define __NR_munlock                151
+#define __NR_mlockall               152
+#define __NR_munlockall             153
+#define __NR_sched_setparam         154
+#define __NR_sched_getparam         155
+#define __NR_sched_setscheduler     156
+#define __NR_sched_getscheduler     157
+#define __NR_sched_yield            158
+#define __NR_sched_get_priority_max 159
+#define __NR_sched_get_priority_min 160
+#define __NR_sched_rr_get_interval  161
+#define __NR_nanosleep              162
+#define __NR_mremap                 163
+#define __NR_setresuid              164
+#define __NR_getresuid              165
+#define __NR_poll                   168
+#define __NR_nfsservctl             169
+#define __NR_setresgid              170
+#define __NR_getresgid              171
+#define __NR_prctl                  172
+#define __NR_rt_sigreturn           173
+#define __NR_rt_sigaction           174
+#define __NR_rt_sigprocmask         175
+#define __NR_rt_sigpending          176
+#define __NR_rt_sigtimedwait        177
+#define __NR_rt_sigqueueinfo        178
+#define __NR_rt_sigsuspend          179
+#define __NR_pread64                180
+#define __NR_pwrite64               181
+#define __NR_chown                  182
+#define __NR_getcwd                 183
+#define __NR_capget                 184
+#define __NR_capset                 185
+#define __NR_sigaltstack            186
+#define __NR_sendfile               187
+#define __NR_vfork                  190
+#define __NR_ugetrlimit             191
+#define __NR_mmap2                  192
+#define __NR_truncate64             193
+#define __NR_ftruncate64            194
+#define __NR_stat64                 195
+#define __NR_lstat64                196
+#define __NR_fstat64                197
+#define __NR_lchown32               198
+#define __NR_getuid32               199
+#define __NR_getgid32               200
+#define __NR_geteuid32              201
+#define __NR_getegid32              202
+#define __NR_setreuid32             203
+#define __NR_setregid32             204
+#define __NR_getgroups32            205
+#define __NR_setgroups32            206
+#define __NR_fchown32               207
+#define __NR_setresuid32            208
+#define __NR_getresuid32            209
+#define __NR_setresgid32            210
+#define __NR_getresgid32            211
+#define __NR_chown32                212
+#define __NR_setuid32               213
+#define __NR_setgid32               214
+#define __NR_setfsuid32             215
+#define __NR_setfsgid32             216
+#define __NR_pivot_root             217
+#define __NR_mincore                218
+#define __NR_madvise                219
+#define __NR_getdents64             220
+#define __NR_fcntl64                221
+#define __NR_gettid                 224
+#define __NR_readahead              225
+#define __NR_setxattr               226
+#define __NR_lsetxattr              227
+#define __NR_fsetxattr              228
+#define __NR_getxattr               229
+#define __NR_lgetxattr              230
+#define __NR_fgetxattr              231
+#define __NR_listxattr              232
+#define __NR_llistxattr             233
+#define __NR_flistxattr             234
+#define __NR_removexattr            235
+#define __NR_lremovexattr           236
+#define __NR_fremovexattr           237
+#define __NR_tkill                  238
+#define __NR_sendfile64             239
+#define __NR_futex                  240
+#define __NR_sched_setaffinity      241
+#define __NR_sched_getaffinity      242
+#define __NR_io_setup               245
+#define __NR_io_destroy             246
+#define __NR_io_getevents           247
+#define __NR_io_submit              248
+#define __NR_io_cancel              249
+#define __NR_fadvise64              250
+#define __NR_exit_group             252
+#define __NR_lookup_dcookie         253
+#define __NR_epoll_create           254
+#define __NR_epoll_ctl              255
+#define __NR_epoll_wait             256
+#define __NR_remap_file_pages       257
+#define __NR_set_tid_address        258
+#define __NR_timer_create           259
+#define __NR_timer_settime          260
+#define __NR_timer_gettime          261
+#define __NR_timer_getoverrun       262
+#define __NR_timer_delete           263
+#define __NR_clock_settime          264
+#define __NR_clock_gettime          265
+#define __NR_clock_getres           266
+#define __NR_clock_nanosleep        267
+#define __NR_statfs64               268
+#define __NR_fstatfs64              269
+#define __NR_tgkill                 270
+#define __NR_utimes                 271
+#define __NR_fadvise64_64           272
+#define __NR_mbind                  274
+#define __NR_get_mempolicy          275
+#define __NR_set_mempolicy          276
+#define __NR_mq_open                277
+#define __NR_mq_unlink              278
+#define __NR_mq_timedsend           279
+#define __NR_mq_timedreceive        280
+#define __NR_mq_notify              281
+#define __NR_mq_getsetattr          282
+#define __NR_kexec_load             283
+#define __NR_waitid                 284
+#define __NR_add_key                285
+#define __NR_request_key            286
+#define __NR_keyctl                 287
+#define __NR_ioprio_set             288
+#define __NR_ioprio_get             289
+#define __NR_inotify_init           290
+#define __NR_inotify_add_watch      291
+#define __NR_inotify_rm_watch       292
+#define __NR_migrate_pages          294
+#define __NR_openat                 295
+#define __NR_mkdirat                296
+#define __NR_mknodat                297
+#define __NR_fchownat               298
+#define __NR_futimesat              299
+#define __NR_fstatat64              300
+#define __NR_unlinkat               301
+#define __NR_renameat               302
+#define __NR_linkat                 303
+#define __NR_symlinkat              304
+#define __NR_readlinkat             305
+#define __NR_fchmodat               306
+#define __NR_faccessat              307
+#define __NR_pselect6               308
+#define __NR_ppoll                  309
+#define __NR_unshare                310
+#define __NR_set_robust_list        311
+#define __NR_get_robust_list        312
+#define __NR_splice                 313
+#define __NR_sync_file_range        314
+#define __NR_tee                    315
+#define __NR_vmsplice               316
+#define __NR_move_pages             317
+#define __NR_getcpu                 318
+#define __NR_epoll_pwait            319
+#define __NR_utimensat              320
+#define __NR_signalfd               321
+#define __NR_timerfd_create         322
+#define __NR_eventfd                323
+#define __NR_fallocate              324
+#define __NR_timerfd_settime        325
+#define __NR_timerfd_gettime        326
+#define __NR_signalfd4              327
+#define __NR_eventfd2               328
+#define __NR_epoll_create1          329
+#define __NR_dup3                   330
+#define __NR_pipe2                  331
+#define __NR_inotify_init1          332
+#define __NR_preadv                 333
+#define __NR_pwritev                334
+#define __NR_rt_tgsigqueueinfo      335
+#define __NR_perf_event_open        336
+#define __NR_fanotify_init          337
+#define __NR_fanotify_mark          338
+#define __NR_prlimit64              339
+#define __NR_socket                 340
+#define __NR_bind                   341
+#define __NR_connect                342
+#define __NR_listen                 343
+#define __NR_accept                 344
+#define __NR_getsockname            345
+#define __NR_getpeername            346
+#define __NR_socketpair             347
+#define __NR_send                   348
+#define __NR_sendto                 349
+#define __NR_recv                   350
+#define __NR_recvfrom               351
+#define __NR_shutdown               352
+#define __NR_setsockopt             353
+#define __NR_getsockopt             354
+#define __NR_sendmsg                355
+#define __NR_recvmsg                356
+#define __NR_recvmmsg               357
+#define __NR_accept4                358
+#define __NR_name_to_handle_at      359
+#define __NR_open_by_handle_at      360
+#define __NR_clock_adjtime          361
+#define __NR_syncfs                 362
+#define __NR_sendmmsg               363
+#define __NR_setns                  364
+#define __NR_process_vm_readv       365
+#define __NR_process_vm_writev      366
+#define __NR_kcmp                   367
+#define __NR_finit_module           368
+
diff --git a/arch/x32/bits/syscall.h b/arch/x32/bits/syscall.h.in
index 9384bc11..0b9362a3 100644
--- a/arch/x32/bits/syscall.h
+++ b/arch/x32/bits/syscall.h.in
@@ -316,327 +316,3 @@
 #define __NR_io_submit (0x40000000 + 544)
 #define __NR_execveat (0x40000000 + 545)
 
-
-
-/* Repeat with SYS_ prefix */
-
-
-
-#define SYS_read __NR_read
-#define SYS_write __NR_write
-#define SYS_open __NR_open
-#define SYS_close __NR_close
-#define SYS_stat __NR_stat
-#define SYS_fstat __NR_fstat
-#define SYS_lstat __NR_lstat
-#define SYS_poll __NR_poll
-#define SYS_lseek __NR_lseek
-#define SYS_mmap __NR_mmap
-#define SYS_mprotect __NR_mprotect
-#define SYS_munmap __NR_munmap
-#define SYS_brk __NR_brk
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_pread64 __NR_pread64
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_access __NR_access
-#define SYS_pipe __NR_pipe
-#define SYS_select __NR_select
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_mremap __NR_mremap
-#define SYS_msync __NR_msync
-#define SYS_mincore __NR_mincore
-#define SYS_madvise __NR_madvise
-#define SYS_shmget __NR_shmget
-#define SYS_shmat __NR_shmat
-#define SYS_shmctl __NR_shmctl
-#define SYS_dup __NR_dup
-#define SYS_dup2 __NR_dup2
-#define SYS_pause __NR_pause
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_getitimer __NR_getitimer
-#define SYS_alarm __NR_alarm
-#define SYS_setitimer __NR_setitimer
-#define SYS_getpid __NR_getpid
-#define SYS_sendfile __NR_sendfile
-#define SYS_socket __NR_socket
-#define SYS_connect __NR_connect
-#define SYS_accept __NR_accept
-#define SYS_sendto __NR_sendto
-#define SYS_shutdown __NR_shutdown
-#define SYS_bind __NR_bind
-#define SYS_listen __NR_listen
-#define SYS_getsockname __NR_getsockname
-#define SYS_getpeername __NR_getpeername
-#define SYS_socketpair __NR_socketpair
-#define SYS_clone __NR_clone
-#define SYS_fork __NR_fork
-#define SYS_vfork __NR_vfork
-#define SYS_exit __NR_exit
-#define SYS_wait4 __NR_wait4
-#define SYS_kill __NR_kill
-#define SYS_uname __NR_uname
-#define SYS_semget __NR_semget
-#define SYS_semop __NR_semop
-#define SYS_semctl __NR_semctl
-#define SYS_shmdt __NR_shmdt
-#define SYS_msgget __NR_msgget
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgctl __NR_msgctl
-#define SYS_fcntl __NR_fcntl
-#define SYS_flock __NR_flock
-#define SYS_fsync __NR_fsync
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_truncate __NR_truncate
-#define SYS_ftruncate __NR_ftruncate
-#define SYS_getdents __NR_getdents
-#define SYS_getcwd __NR_getcwd
-#define SYS_chdir __NR_chdir
-#define SYS_fchdir __NR_fchdir
-#define SYS_rename __NR_rename
-#define SYS_mkdir __NR_mkdir
-#define SYS_rmdir __NR_rmdir
-#define SYS_creat __NR_creat
-#define SYS_link __NR_link
-#define SYS_unlink __NR_unlink
-#define SYS_symlink __NR_symlink
-#define SYS_readlink __NR_readlink
-#define SYS_chmod __NR_chmod
-#define SYS_fchmod __NR_fchmod
-#define SYS_chown __NR_chown
-#define SYS_fchown __NR_fchown
-#define SYS_lchown __NR_lchown
-#define SYS_umask __NR_umask
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_getrlimit __NR_getrlimit
-#define SYS_getrusage __NR_getrusage
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_times __NR_times
-#define SYS_getuid __NR_getuid
-#define SYS_syslog __NR_syslog
-#define SYS_getgid __NR_getgid
-#define SYS_setuid __NR_setuid
-#define SYS_setgid __NR_setgid
-#define SYS_geteuid __NR_geteuid
-#define SYS_getegid __NR_getegid
-#define SYS_setpgid __NR_setpgid
-#define SYS_getppid __NR_getppid
-#define SYS_getpgrp __NR_getpgrp
-#define SYS_setsid __NR_setsid
-#define SYS_setreuid __NR_setreuid
-#define SYS_setregid __NR_setregid
-#define SYS_getgroups __NR_getgroups
-#define SYS_setgroups __NR_setgroups
-#define SYS_setresuid __NR_setresuid
-#define SYS_getresuid __NR_getresuid
-#define SYS_setresgid __NR_setresgid
-#define SYS_getresgid __NR_getresgid
-#define SYS_getpgid __NR_getpgid
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_getsid __NR_getsid
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_utime __NR_utime
-#define SYS_mknod __NR_mknod
-#define SYS_personality __NR_personality
-#define SYS_ustat __NR_ustat
-#define SYS_statfs __NR_statfs
-#define SYS_fstatfs __NR_fstatfs
-#define SYS_sysfs __NR_sysfs
-#define SYS_getpriority __NR_getpriority
-#define SYS_setpriority __NR_setpriority
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_mlock __NR_mlock
-#define SYS_munlock __NR_munlock
-#define SYS_mlockall __NR_mlockall
-#define SYS_munlockall __NR_munlockall
-#define SYS_vhangup __NR_vhangup
-#define SYS_modify_ldt __NR_modify_ldt
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_prctl __NR_prctl
-#define SYS_arch_prctl __NR_arch_prctl
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_chroot __NR_chroot
-#define SYS_sync __NR_sync
-#define SYS_acct __NR_acct
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_mount __NR_mount
-#define SYS_umount2 __NR_umount2
-#define SYS_swapon __NR_swapon
-#define SYS_swapoff __NR_swapoff
-#define SYS_reboot __NR_reboot
-#define SYS_sethostname __NR_sethostname
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_iopl __NR_iopl
-#define SYS_ioperm __NR_ioperm
-#define SYS_init_module __NR_init_module
-#define SYS_delete_module __NR_delete_module
-#define SYS_quotactl __NR_quotactl
-#define SYS_getpmsg __NR_getpmsg
-#define SYS_putpmsg __NR_putpmsg
-#define SYS_afs_syscall __NR_afs_syscall
-#define SYS_tuxcall __NR_tuxcall
-#define SYS_security __NR_security
-#define SYS_gettid __NR_gettid
-#define SYS_readahead __NR_readahead
-#define SYS_setxattr __NR_setxattr
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_getxattr __NR_getxattr
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_removexattr __NR_removexattr
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_tkill __NR_tkill
-#define SYS_time __NR_time
-#define SYS_futex __NR_futex
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_epoll_create __NR_epoll_create
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_getdents64 __NR_getdents64
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_fadvise64 __NR_fadvise64
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_exit_group __NR_exit_group
-#define SYS_epoll_wait __NR_epoll_wait
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_tgkill __NR_tgkill
-#define SYS_utimes __NR_utimes
-#define SYS_mbind __NR_mbind
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_add_key __NR_add_key
-#define SYS_request_key __NR_request_key
-#define SYS_keyctl __NR_keyctl
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_inotify_init __NR_inotify_init
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_migrate_pages __NR_migrate_pages
-#define SYS_openat __NR_openat
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_mknodat __NR_mknodat
-#define SYS_fchownat __NR_fchownat
-#define SYS_futimesat __NR_futimesat
-#define SYS_newfstatat __NR_newfstatat
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_renameat __NR_renameat
-#define SYS_linkat __NR_linkat
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_faccessat __NR_faccessat
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ppoll __NR_ppoll
-#define SYS_unshare __NR_unshare
-#define SYS_splice __NR_splice
-#define SYS_tee __NR_tee
-#define SYS_sync_file_range __NR_sync_file_range
-#define SYS_utimensat __NR_utimensat
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_signalfd __NR_signalfd
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_eventfd __NR_eventfd
-#define SYS_fallocate __NR_fallocate
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_accept4 __NR_accept4
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_dup3 __NR_dup3
-#define SYS_pipe2 __NR_pipe2
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_syncfs __NR_syncfs
-#define SYS_setns __NR_setns
-#define SYS_getcpu __NR_getcpu
-#define SYS_kcmp __NR_kcmp
-#define SYS_finit_module __NR_finit_module
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_renameat2 __NR_renameat2
-#define SYS_seccomp __NR_seccomp
-#define SYS_getrandom __NR_getrandom
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_kexec_file_load __NR_kexec_file_load
-#define SYS_bpf __NR_bpf
-#define SYS_userfaultfd __NR_userfaultfd
-#define SYS_membarrier __NR_membarrier
-#define SYS_mlock2 __NR_mlock2
-#define SYS_copy_file_range __NR_copy_file_range
-
-
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_ioctl __NR_ioctl
-#define SYS_readv __NR_readv
-#define SYS_writev __NR_writev
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_execve __NR_execve
-#define SYS_ptrace __NR_ptrace
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_timer_create __NR_timer_create
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_waitid __NR_waitid
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_move_pages __NR_move_pages
-#define SYS_preadv __NR_preadv
-#define SYS_pwritev __NR_pwritev
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_submit __NR_io_submit
-#define SYS_execveat __NR_execveat
diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h.in
index 1b02df9f..7e638a03 100644
--- a/arch/x86_64/bits/syscall.h
+++ b/arch/x86_64/bits/syscall.h.in
@@ -326,334 +326,3 @@
 #define __NR_mlock2				325
 #define __NR_copy_file_range			326
 
-
-
-/* Repeat with SYS_ prefix */
-
-#define SYS_read				0
-#define SYS_write				1
-#define SYS_open				2
-#define SYS_close				3
-#define SYS_stat				4
-#define SYS_fstat				5
-#define SYS_lstat				6
-#define SYS_poll				7
-#define SYS_lseek				8
-#define SYS_mmap				9
-#define SYS_mprotect			10
-#define SYS_munmap				11
-#define SYS_brk				12
-#define SYS_rt_sigaction		13
-#define SYS_rt_sigprocmask		14
-#define SYS_rt_sigreturn		15
-#define SYS_ioctl				16
-#define SYS_pread64			17
-#define SYS_pwrite64			18
-#define SYS_readv				19
-#define SYS_writev				20
-#define SYS_access				21
-#define SYS_pipe				22
-#define SYS_select				23
-#define SYS_sched_yield		24
-#define SYS_mremap				25
-#define SYS_msync				26
-#define SYS_mincore			27
-#define SYS_madvise			28
-#define SYS_shmget				29
-#define SYS_shmat				30
-#define SYS_shmctl				31
-#define SYS_dup				32
-#define SYS_dup2				33
-#define SYS_pause				34
-#define SYS_nanosleep			35
-#define SYS_getitimer			36
-#define SYS_alarm				37
-#define SYS_setitimer			38
-#define SYS_getpid				39
-#define SYS_sendfile			40
-#define SYS_socket				41
-#define SYS_connect			42
-#define SYS_accept				43
-#define SYS_sendto				44
-#define SYS_recvfrom			45
-#define SYS_sendmsg			46
-#define SYS_recvmsg			47
-#define SYS_shutdown			48
-#define SYS_bind				49
-#define SYS_listen				50
-#define SYS_getsockname		51
-#define SYS_getpeername		52
-#define SYS_socketpair			53
-#define SYS_setsockopt			54
-#define SYS_getsockopt			55
-#define SYS_clone				56
-#define SYS_fork				57
-#define SYS_vfork				58
-#define SYS_execve				59
-#define SYS_exit				60
-#define SYS_wait4				61
-#define SYS_kill				62
-#define SYS_uname				63
-#define SYS_semget				64
-#define SYS_semop				65
-#define SYS_semctl				66
-#define SYS_shmdt				67
-#define SYS_msgget				68
-#define SYS_msgsnd				69
-#define SYS_msgrcv				70
-#define SYS_msgctl				71
-#define SYS_fcntl				72
-#define SYS_flock				73
-#define SYS_fsync				74
-#define SYS_fdatasync			75
-#define SYS_truncate			76
-#define SYS_ftruncate			77
-#define SYS_getdents			78
-#define SYS_getcwd				79
-#define SYS_chdir				80
-#define SYS_fchdir				81
-#define SYS_rename				82
-#define SYS_mkdir				83
-#define SYS_rmdir				84
-#define SYS_creat				85
-#define SYS_link				86
-#define SYS_unlink				87
-#define SYS_symlink			88
-#define SYS_readlink			89
-#define SYS_chmod				90
-#define SYS_fchmod				91
-#define SYS_chown				92
-#define SYS_fchown				93
-#define SYS_lchown				94
-#define SYS_umask				95
-#define SYS_gettimeofday		96
-#define SYS_getrlimit			97
-#define SYS_getrusage			98
-#define SYS_sysinfo			99
-#define SYS_times				100
-#define SYS_ptrace				101
-#define SYS_getuid				102
-#define SYS_syslog				103
-#define SYS_getgid				104
-#define SYS_setuid				105
-#define SYS_setgid				106
-#define SYS_geteuid			107
-#define SYS_getegid			108
-#define SYS_setpgid			109
-#define SYS_getppid			110
-#define SYS_getpgrp			111
-#define SYS_setsid				112
-#define SYS_setreuid			113
-#define SYS_setregid			114
-#define SYS_getgroups			115
-#define SYS_setgroups			116
-#define SYS_setresuid			117
-#define SYS_getresuid			118
-#define SYS_setresgid			119
-#define SYS_getresgid			120
-#define SYS_getpgid			121
-#define SYS_setfsuid			122
-#define SYS_setfsgid			123
-#define SYS_getsid				124
-#define SYS_capget				125
-#define SYS_capset				126
-#define SYS_rt_sigpending		127
-#define SYS_rt_sigtimedwait	128
-#define SYS_rt_sigqueueinfo	129
-#define SYS_rt_sigsuspend		130
-#define SYS_sigaltstack		131
-#define SYS_utime				132
-#define SYS_mknod				133
-#define SYS_uselib				134
-#define SYS_personality		135
-#define SYS_ustat				136
-#define SYS_statfs				137
-#define SYS_fstatfs			138
-#define SYS_sysfs				139
-#define SYS_getpriority			140
-#define SYS_setpriority			141
-#define SYS_sched_setparam			142
-#define SYS_sched_getparam			143
-#define SYS_sched_setscheduler		144
-#define SYS_sched_getscheduler		145
-#define SYS_sched_get_priority_max	146
-#define SYS_sched_get_priority_min	147
-#define SYS_sched_rr_get_interval	148
-#define SYS_mlock					149
-#define SYS_munlock				150
-#define SYS_mlockall				151
-#define SYS_munlockall				152
-#define SYS_vhangup				153
-#define SYS_modify_ldt				154
-#define SYS_pivot_root				155
-#define SYS__sysctl				156
-#define SYS_prctl					157
-#define SYS_arch_prctl				158
-#define SYS_adjtimex				159
-#define SYS_setrlimit				160
-#define SYS_chroot					161
-#define SYS_sync					162
-#define SYS_acct					163
-#define SYS_settimeofday			164
-#define SYS_mount					165
-#define SYS_umount2				166
-#define SYS_swapon					167
-#define SYS_swapoff				168
-#define SYS_reboot					169
-#define SYS_sethostname			170
-#define SYS_setdomainname			171
-#define SYS_iopl					172
-#define SYS_ioperm					173
-#define SYS_create_module			174
-#define SYS_init_module			175
-#define SYS_delete_module			176
-#define SYS_get_kernel_syms		177
-#define SYS_query_module			178
-#define SYS_quotactl				179
-#define SYS_nfsservctl				180
-#define SYS_getpmsg				181
-#define SYS_putpmsg				182
-#define SYS_afs_syscall			183
-#define SYS_tuxcall				184
-#define SYS_security				185
-#define SYS_gettid					186
-#define SYS_readahead				187
-#define SYS_setxattr				188
-#define SYS_lsetxattr				189
-#define SYS_fsetxattr				190
-#define SYS_getxattr				191
-#define SYS_lgetxattr				192
-#define SYS_fgetxattr				193
-#define SYS_listxattr				194
-#define SYS_llistxattr				195
-#define SYS_flistxattr				196
-#define SYS_removexattr			197
-#define SYS_lremovexattr			198
-#define SYS_fremovexattr			199
-#define SYS_tkill					200
-#define SYS_time					201
-#define SYS_futex					202
-#define SYS_sched_setaffinity		203
-#define SYS_sched_getaffinity		204
-#define SYS_set_thread_area		205
-#define SYS_io_setup				206
-#define SYS_io_destroy				207
-#define SYS_io_getevents			208
-#define SYS_io_submit				209
-#define SYS_io_cancel				210
-#define SYS_get_thread_area		211
-#define SYS_lookup_dcookie			212
-#define SYS_epoll_create			213
-#define SYS_epoll_ctl_old			214
-#define SYS_epoll_wait_old			215
-#define SYS_remap_file_pages		216
-#define SYS_getdents64				217
-#define SYS_set_tid_address		218
-#define SYS_restart_syscall		219
-#define SYS_semtimedop				220
-#define SYS_fadvise64				221
-#define SYS_timer_create			222
-#define SYS_timer_settime			223
-#define SYS_timer_gettime			224
-#define SYS_timer_getoverrun		225
-#define SYS_timer_delete			226
-#define SYS_clock_settime			227
-#define SYS_clock_gettime			228
-#define SYS_clock_getres			229
-#define SYS_clock_nanosleep		230
-#define SYS_exit_group				231
-#define SYS_epoll_wait				232
-#define SYS_epoll_ctl				233
-#define SYS_tgkill					234
-#define SYS_utimes					235
-#define SYS_vserver				236
-#define SYS_mbind					237
-#define SYS_set_mempolicy			238
-#define SYS_get_mempolicy			239
-#define SYS_mq_open				240
-#define SYS_mq_unlink				241
-#define SYS_mq_timedsend			242
-#define SYS_mq_timedreceive		243
-#define SYS_mq_notify				244
-#define SYS_mq_getsetattr			245
-#define SYS_kexec_load				246
-#define SYS_waitid					247
-#define SYS_add_key				248
-#define SYS_request_key			249
-#define SYS_keyctl					250
-#define SYS_ioprio_set				251
-#define SYS_ioprio_get				252
-#define SYS_inotify_init			253
-#define SYS_inotify_add_watch		254
-#define SYS_inotify_rm_watch		255
-#define SYS_migrate_pages			256
-#define SYS_openat					257
-#define SYS_mkdirat				258
-#define SYS_mknodat				259
-#define SYS_fchownat				260
-#define SYS_futimesat				261
-#define SYS_newfstatat				262
-#define SYS_unlinkat				263
-#define SYS_renameat				264
-#define SYS_linkat					265
-#define SYS_symlinkat				266
-#define SYS_readlinkat				267
-#define SYS_fchmodat				268
-#define SYS_faccessat				269
-#define SYS_pselect6				270
-#define SYS_ppoll					271
-#define SYS_unshare				272
-#define SYS_set_robust_list		273
-#define SYS_get_robust_list		274
-#define SYS_splice					275
-#define SYS_tee					276
-#define SYS_sync_file_range		277
-#define SYS_vmsplice				278
-#define SYS_move_pages				279
-#define SYS_utimensat				280
-#define SYS_epoll_pwait			281
-#define SYS_signalfd				282
-#define SYS_timerfd_create			283
-#define SYS_eventfd				284
-#define SYS_fallocate				285
-#define SYS_timerfd_settime		286
-#define SYS_timerfd_gettime		287
-#define SYS_accept4				288
-#define SYS_signalfd4				289
-#define SYS_eventfd2				290
-#define SYS_epoll_create1			291
-#define SYS_dup3					292
-#define SYS_pipe2					293
-#define SYS_inotify_init1			294
-#define SYS_preadv					295
-#define SYS_pwritev				296
-#define SYS_rt_tgsigqueueinfo		297
-#define SYS_perf_event_open		298
-#define SYS_recvmmsg				299
-#define SYS_fanotify_init			300
-#define SYS_fanotify_mark			301
-#define SYS_prlimit64				302
-#define SYS_name_to_handle_at			303
-#define SYS_open_by_handle_at			304
-#define SYS_clock_adjtime			305
-#define SYS_syncfs				306
-#define SYS_sendmmsg				307
-#define SYS_setns				308
-#define SYS_getcpu				309
-#define SYS_process_vm_readv			310
-#define SYS_process_vm_writev			311
-#define SYS_kcmp				312
-#define SYS_finit_module			313
-#define SYS_sched_setattr			314
-#define SYS_sched_getattr			315
-#define SYS_renameat2				316
-#define SYS_seccomp				317
-#define SYS_getrandom				318
-#define SYS_memfd_create			319
-#define SYS_kexec_file_load			320
-#define SYS_bpf					321
-#define SYS_execveat				322
-#define SYS_userfaultfd				323
-#define SYS_membarrier				324
-#define SYS_mlock2				325
-#define SYS_copy_file_range			326