kernel/sched/core.c syscalls

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/alpha.m4 b/alpha.m4
index 053d696..5f3690a 100644
--- a/alpha.m4
+++ b/alpha.m4
@@ -329,14 +329,14 @@
 sys_ustat
 sys_statfs
 sys_fstatfs
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_ni_syscall
 sys_newuname
 sys_nanosleep
@@ -394,8 +394,8 @@
 lremovexattr
 fremovexattr
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 io_setup
 io_destroy
diff --git a/amd64.m4 b/amd64.m4
index 8476319..84bcd5a 100644
--- a/amd64.m4
+++ b/amd64.m4
@@ -23,7 +23,7 @@
 access
 sys_pipe
 sys_select
-sys_sched_yield
+sched_yield
 sys_mremap
 sys_msync
 sys_mincore
@@ -141,13 +141,13 @@
 sys_sysfs
 sys_getpriority
 sys_setpriority
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_mlock
 sys_munlock
 sys_mlockall
@@ -202,8 +202,8 @@
 sys_tkill
 time
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 set_thread_area
 io_setup
 io_destroy
diff --git a/arm-C.m4 b/arm-C.m4
index 28b4ae1..7984918 100644
--- a/arm-C.m4
+++ b/arm-C.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 compat_sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 compat_sys_futex
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 io_setup
 io_destroy
 io_getevents
diff --git a/arm.m4 b/arm.m4
index 6cd0bc8..377f42a 100644
--- a/arm.m4
+++ b/arm.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 io_setup
 io_destroy
 io_getevents
diff --git a/arm64.m4 b/arm64.m4
index 0a79c69..382d08f 100644
--- a/arm64.m4
+++ b/arm64.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/avr32.m4 b/avr32.m4
index b27f4fc..083f394 100644
--- a/avr32.m4
+++ b/avr32.m4
@@ -134,14 +134,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_poll
 sys_ni_syscall
@@ -192,8 +192,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_capget
 sys_capset
 io_setup
diff --git a/blackfin.m4 b/blackfin.m4
index f113bca..c7c05fa 100644
--- a/blackfin.m4
+++ b/blackfin.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/c6x.m4 b/c6x.m4
index 0356a74..2407195 100644
--- a/c6x.m4
+++ b/c6x.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/calls b/calls
index 6c0a1e9..ff11bdd 100644
--- a/calls
+++ b/calls
@@ -58,3 +58,15 @@
 #	itimerval stuff
 timelike(setitimer)
 timelike(getitimer)
+#	sched family
+all(nice)
+all(sched_setscheduler)
+all(sched_setparam)
+all(sched_getscheduler)
+all(sched_getparam)
+compat(sched_setaffinity) # actually, on little-endian it should be an alias
+compat(sched_getaffinity) # actually, on little-endian it should be an alias
+all(sched_yield)
+all(sched_get_priority_max)
+all(sched_get_priority_min)
+timelike(sched_rr_get_interval)
diff --git a/cris.m4 b/cris.m4
index 92f22bf..5a1f860 100644
--- a/cris.m4
+++ b/cris.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/frv.m4 b/frv.m4
index 0f9406f..bd51831 100644
--- a/frv.m4
+++ b/frv.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/h8300.m4 b/h8300.m4
index 1b5a791..2f3e177 100644
--- a/h8300.m4
+++ b/h8300.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_ni_syscall
 sys_ni_syscall
 sys_ni_syscall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_ni_syscall
 sys_setresuid16
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/hexagon.m4 b/hexagon.m4
index 4fcf119..c937a75 100644
--- a/hexagon.m4
+++ b/hexagon.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/i386.m4 b/i386.m4
index a8f7322..e41d6ad 100644
--- a/i386.m4
+++ b/i386.m4
@@ -30,7 +30,7 @@
 sys_pause
 utime
 access
-sys_nice
+nice
 sys_sync
 sys_kill
 rename
@@ -140,14 +140,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -221,8 +221,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_set_thread_area
 sys_get_thread_area
 io_setup
diff --git a/ia64.m4 b/ia64.m4
index f8568e2..4d784d6 100644
--- a/ia64.m4
+++ b/ia64.m4
@@ -135,14 +135,14 @@
 sys_msync
 sys_munlock
 sys_munlockall
-sys_sched_getparam
-sys_sched_setparam
-sys_sched_getscheduler
-sys_sched_setscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_getparam
+sched_setparam
+sched_getscheduler
+sched_setscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_ni_syscall
 sys_prctl
@@ -206,8 +206,8 @@
 fremovexattr
 sys_tkill
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_set_tid_address
 sys_fadvise64_64
 sys_tgkill
diff --git a/m32r.m4 b/m32r.m4
index 669496f..b1b6f39 100644
--- a/m32r.m4
+++ b/m32r.m4
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_ni_syscall
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/m68k.m4 b/m68k.m4
index 804e17f..5772875 100644
--- a/m68k.m4
+++ b/m68k.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -310,8 +310,8 @@
 sys_tee
 sys_vmsplice
 sys_move_pages
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_kexec_load
 sys_getcpu
 sys_epoll_pwait
diff --git a/microblaze.m4 b/microblaze.m4
index b8edf1d..28e12cc 100644
--- a/microblaze.m4
+++ b/microblaze.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/mips-C.m4 b/mips-C.m4
index c398e37..3f92a2f 100644
--- a/mips-C.m4
+++ b/mips-C.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -157,14 +157,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 compat_sys_nanosleep
 sys_mremap
 sys_accept
@@ -238,8 +238,8 @@
 sys_tkill
 sys_sendfile64
 sys_32_futex
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 io_setup
 io_destroy
 io_getevents
diff --git a/mips-n32.m4 b/mips-n32.m4
index 7c10ee2..bcc3a1f 100644
--- a/mips-n32.m4
+++ b/mips-n32.m4
@@ -22,7 +22,7 @@
 access
 sysm_pipe
 compat_sys_select
-sys_sched_yield
+sched_yield
 sys_mremap
 sys_msync
 sys_mincore
@@ -138,13 +138,13 @@
 sys_sysfs
 sys_getpriority
 sys_setpriority
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_mlock
 sys_munlock
 sys_mlockall
@@ -194,8 +194,8 @@
 sys_tkill
 sys_ni_syscall
 sys_32_futex
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_cacheflush
 sys_cachectl
 sys_sysmips
diff --git a/mips32.m4 b/mips32.m4
index f07ccfd..d46efa1 100644
--- a/mips32.m4
+++ b/mips32.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -157,14 +157,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep,
 sys_mremap,
 sys_accept
@@ -238,8 +238,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 io_setup
 io_destroy
 io_getevents
diff --git a/mips64.m4 b/mips64.m4
index 87cbefc..53e9c25 100644
--- a/mips64.m4
+++ b/mips64.m4
@@ -22,7 +22,7 @@
 access
 sysm_pipe
 sys_select
-sys_sched_yield
+sched_yield
 sys_mremap
 sys_msync
 sys_mincore
@@ -138,13 +138,13 @@
 sys_sysfs
 sys_getpriority
 sys_setpriority
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_mlock
 sys_munlock
 sys_mlockall
@@ -194,8 +194,8 @@
 sys_tkill
 sys_ni_syscall
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_cacheflush
 sys_cachectl
 sys_sysmips
diff --git a/mn10300.m4 b/mn10300.m4
index b6cc03e..1420166 100644
--- a/mn10300.m4
+++ b/mn10300.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/openrisc.m4 b/openrisc.m4
index 0a7dbf9..0e1eef6 100644
--- a/openrisc.m4
+++ b/openrisc.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/parisc-C.m4 b/parisc-C.m4
index 491c591..5f8d1f0 100644
--- a/parisc-C.m4
+++ b/parisc-C.m4
@@ -33,7 +33,7 @@
 sys_connect
 sys_listen
 access
-sys_nice
+nice
 sys_accept
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 compat_sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -210,8 +210,8 @@
 sys_tkill
 sys_sendfile64
 compat_sys_futex
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 BUG(sys_io_setup,	should be compat_sys_io_setup)
diff --git a/parisc32.m4 b/parisc32.m4
index 2c396aa..8c3e768 100644
--- a/parisc32.m4
+++ b/parisc32.m4
@@ -33,7 +33,7 @@
 sys_connect
 sys_listen
 access
-sys_nice
+nice
 sys_accept
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -210,8 +210,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/parisc64.m4 b/parisc64.m4
index da83e90..0954cff 100644
--- a/parisc64.m4
+++ b/parisc64.m4
@@ -33,7 +33,7 @@
 sys_connect
 sys_listen
 access
-sys_nice
+nice
 sys_accept
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -210,8 +210,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/powerpc-C.m4 b/powerpc-C.m4
index 446cccc..7be0a4a 100644
--- a/powerpc-C.m4
+++ b/powerpc-C.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 compat_sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -221,8 +221,8 @@
 lremovexattr
 fremovexattr
 compat_sys_futex
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 compat_sys_sendfile64_wrapper
diff --git a/powerpc32.m4 b/powerpc32.m4
index 80b07ec..d96b8f7 100644
--- a/powerpc32.m4
+++ b/powerpc32.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -221,8 +221,8 @@
 lremovexattr
 fremovexattr
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 sys_ni_syscall
diff --git a/powerpc64.m4 b/powerpc64.m4
index 8ee1727..597351c 100644
--- a/powerpc64.m4
+++ b/powerpc64.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid
@@ -221,8 +221,8 @@
 lremovexattr
 fremovexattr
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 sys_sendfile64
diff --git a/s390-C.m4 b/s390-C.m4
index 94bdcf1..f0f78d2 100644
--- a/s390-C.m4
+++ b/s390-C.m4
@@ -157,10 +157,10 @@
 sys32_sched_getparam_wrapper
 sys32_sched_setscheduler_wrapper
 sys32_sched_getscheduler_wrapper
-sys_sched_yield
+sched_yield
 sys32_sched_get_priority_max_wrapper
 sys32_sched_get_priority_min_wrapper
-compat_sys_sched_rr_get_interval
+sched_rr_get_interval
 compat_sys_nanosleep_wrapper
 sys32_mremap_wrapper
 sys32_setresuid16_wrapper
diff --git a/s390.m4 b/s390.m4
index 4fe5cb8..1c49dd3 100644
--- a/s390.m4
+++ b/s390.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -238,8 +238,8 @@
 sys_gettid
 sys_tkill
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_tgkill
 sys_ni_syscall
 io_setup
diff --git a/s390x.m4 b/s390x.m4
index 3426ea9..9199804 100644
--- a/s390x.m4
+++ b/s390x.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_ni_syscall
@@ -238,8 +238,8 @@
 sys_gettid
 sys_tkill
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_tgkill
 sys_ni_syscall
 io_setup
diff --git a/score.m4 b/score.m4
index a69f08d..7c909a0 100644
--- a/score.m4
+++ b/score.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/sh32.m4 b/sh32.m4
index daffad3..2d835f3 100644
--- a/sh32.m4
+++ b/sh32.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -240,8 +240,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/sh64.m4 b/sh64.m4
index bc1e746..4fc2405 100644
--- a/sh64.m4
+++ b/sh64.m4
@@ -33,7 +33,7 @@
 sys_ni_syscall
 sys_ni_syscall
 access
-sys_nice
+nice
 sys_ni_syscall
 sys_sync
 sys_kill
@@ -153,14 +153,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -268,8 +268,8 @@
 sys_tkill
 sys_sendfile64
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_ni_syscall
 sys_ni_syscall
 io_setup
diff --git a/sparc-C.m4 b/sparc-C.m4
index b4ef699..9df97b7 100644
--- a/sparc-C.m4
+++ b/sparc-C.m4
@@ -159,8 +159,8 @@
 compat_sys_statfs
 compat_sys_fstatfs
 oldumount
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys32_getdomainname
 sys32_setdomainname
 sys_nis_syscall
@@ -244,10 +244,10 @@
 sys32_sched_getparam
 sys32_sched_setscheduler
 sys32_sched_getscheduler
-sys_sched_yield
+sched_yield
 sys32_sched_get_priority_max
 sys32_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_rr_get_interval
 compat_sys_nanosleep
 sys_mremap
 compat_sys_sysctl
@@ -259,8 +259,8 @@
 compat_sys_clock_gettime
 compat_sys_clock_getres
 sys32_clock_nanosleep
-compat_sys_sched_getaffinity
-compat_sys_sched_setaffinity
+sched_getaffinity
+sched_setaffinity
 sys32_timer_settime
 compat_sys_timer_gettime
 sys_timer_getoverrun
diff --git a/sparc32.m4 b/sparc32.m4
index 887e0e5..bb6f6b0 100644
--- a/sparc32.m4
+++ b/sparc32.m4
@@ -33,7 +33,7 @@
 sys_lchown
 sys_fchown
 access
-sys_nice
+nice
 sys_chown
 sys_sync
 sys_kill
@@ -159,8 +159,8 @@
 sys_statfs
 sys_fstatfs
 oldumount
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_getdomainname
 sys_setdomainname
 sys_nis_syscall
@@ -240,14 +240,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_mremap
 sys_sysctl
@@ -259,8 +259,8 @@
 sys_clock_gettime
 sys_clock_getres
 sys_clock_nanosleep
-sys_sched_getaffinity
-sys_sched_setaffinity
+sched_getaffinity
+sched_setaffinity
 sys_timer_settime
 sys_timer_gettime
 sys_timer_getoverrun
diff --git a/sparc64.m4 b/sparc64.m4
index 5008f07..bf9fe56 100644
--- a/sparc64.m4
+++ b/sparc64.m4
@@ -33,7 +33,7 @@
 sys_nis_syscall
 sys_nis_syscall
 access
-sys_nice
+nice
 sys_nis_syscall
 sys_sync
 sys_kill
@@ -159,8 +159,8 @@
 sys_statfs
 sys_fstatfs
 oldumount
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_getdomainname
 sys_setdomainname
 sys_utrap_install
@@ -240,14 +240,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_nanosleep
 sys_64_mremap
 sys_sysctl
@@ -259,8 +259,8 @@
 sys_clock_gettime
 sys_clock_getres
 sys_clock_nanosleep
-sys_sched_getaffinity
-sys_sched_setaffinity
+sched_getaffinity
+sched_setaffinity
 sys_timer_settime
 sys_timer_gettime
 sys_timer_getoverrun
diff --git a/tile-C.m4 b/tile-C.m4
index f429ce9..5ca89bd 100644
--- a/tile-C.m4
+++ b/tile-C.m4
@@ -117,16 +117,16 @@
 compat_sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/tile32.m4 b/tile32.m4
index 731e0be..ed42952 100644
--- a/tile32.m4
+++ b/tile32.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/tile64.m4 b/tile64.m4
index 749da35..ed066e8 100644
--- a/tile64.m4
+++ b/tile64.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/unicore32.m4 b/unicore32.m4
index 4fcf119..c937a75 100644
--- a/unicore32.m4
+++ b/unicore32.m4
@@ -117,16 +117,16 @@
 sys_clock_nanosleep
 sys_syslog
 sys_ptrace
-sys_sched_setparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_getparam
-sys_sched_setaffinity
-sys_sched_getaffinity
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_setscheduler
+sched_getscheduler
+sched_getparam
+sched_setaffinity
+sched_getaffinity
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_restart_syscall
 sys_kill
 sys_tkill
diff --git a/x32.m4 b/x32.m4
index 11ad8c0..164fed2 100644
--- a/x32.m4
+++ b/x32.m4
@@ -18,7 +18,7 @@
 access
 sys_pipe
 sys_select
-sys_sched_yield
+sched_yield
 sys_mremap
 sys_msync
 sys_mincore
@@ -124,13 +124,13 @@
 sys_sysfs
 sys_getpriority
 sys_setpriority
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 sys_mlock
 sys_munlock
 sys_mlockall
@@ -180,8 +180,8 @@
 sys_tkill
 time
 sys_futex
-sys_sched_setaffinity
-sys_sched_getaffinity
+BUG(sys_sched_setaffinity,	harmless, should bs compat_sched_setaffinity)
+BUG(sys_sched_getaffinity,	harmless, should bs compat_sched_getaffinity)
 BUG(sys_io_setup,	should be compat_sys_io_setup)
 io_destroy
 io_getevents
diff --git a/x86-C.m4 b/x86-C.m4
index a34ea10..5bb7260 100644
--- a/x86-C.m4
+++ b/x86-C.m4
@@ -30,7 +30,7 @@
 sys_pause
 utime
 access
-sys_nice
+nice
 sys_sync
 sys32_kill
 rename
@@ -140,14 +140,14 @@
 sys_munlock
 sys_mlockall
 sys_munlockall
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_yield
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-compat_sys_sched_rr_get_interval
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_yield
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
 compat_sys_nanosleep
 sys_mremap
 sys_setresuid16
@@ -221,8 +221,8 @@
 sys_tkill
 sys_sendfile64
 compat_sys_futex
-compat_sys_sched_setaffinity
-compat_sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_set_thread_area
 sys_get_thread_area
 io_setup
diff --git a/xtensa.m4 b/xtensa.m4
index 820dce2..ec1c49b 100644
--- a/xtensa.m4
+++ b/xtensa.m4
@@ -155,8 +155,8 @@
 sys_ni_syscall
 times
 sys_acct
-sys_sched_setaffinity
-sys_sched_getaffinity
+sched_setaffinity
+sched_getaffinity
 sys_capget
 sys_capset
 sys_ptrace
@@ -211,14 +211,14 @@
 sys_sysinfo
 sys_init_module
 sys_delete_module
-sys_sched_setparam
-sys_sched_getparam
-sys_sched_setscheduler
-sys_sched_getscheduler
-sys_sched_get_priority_max
-sys_sched_get_priority_min
-sys_sched_rr_get_interval
-sys_sched_yield
+sched_setparam
+sched_getparam
+sched_setscheduler
+sched_getscheduler
+sched_get_priority_max
+sched_get_priority_min
+sched_rr_get_interval
+sched_yield
 sys_ni_syscall
 sys_restart_syscall
 sys_sigaltstack