aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/systbl.S
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-18 14:51:57 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-18 14:51:57 +1000
commitb09a4913b15d2544f8918f05b9937cb4e99a2319 (patch)
treeed8e4764e6358f18e5641f6fba5815ea88ac1f5e /arch/powerpc/kernel/systbl.S
parent81e7009ea46c951860b8716ee427ff4f54dd26fc (diff)
powerpc: change sys32_ to compat_sys_
This allows us to get rid of one type of entry in systbl.S. In passing we remove the duplicate compat_sys_getdents and compat_sys_utimes for which there are generic versions. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/kernel/systbl.S')
-rw-r--r--arch/powerpc/kernel/systbl.S116
1 files changed, 57 insertions, 59 deletions
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index b364141ec01..2103f78f644 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -19,15 +19,13 @@
#ifdef CONFIG_PPC64
#define SYSCALL(func) .llong .sys_##func,.sys_##func
-#define SYSCALL32(func) .llong .sys_##func,.sys32_##func
#define COMPAT_SYS(func) .llong .sys_##func,.compat_sys_##func
#define PPC_SYS(func) .llong .ppc_##func,.ppc_##func
#define OLDSYS(func) .llong .sys_ni_syscall,.sys_ni_syscall
-#define SYS32ONLY(func) .llong .sys_ni_syscall,.sys32_##func
+#define SYS32ONLY(func) .llong .sys_ni_syscall,.compat_sys_##func
#define SYSX(f, f3264, f32) .llong .f,.f3264
#else
#define SYSCALL(func) .long sys_##func
-#define SYSCALL32(func) .long sys_##func
#define COMPAT_SYS(func) .long sys_##func
#define PPC_SYS(func) .long ppc_##func
#define OLDSYS(func) .long sys_##func
@@ -50,11 +48,11 @@ SYSCALL(read)
SYSCALL(write)
COMPAT_SYS(open)
SYSCALL(close)
-SYSCALL32(waitpid)
-SYSCALL32(creat)
+COMPAT_SYS(waitpid)
+COMPAT_SYS(creat)
SYSCALL(link)
SYSCALL(unlink)
-SYSCALL32(execve)
+COMPAT_SYS(execve)
SYSCALL(chdir)
SYSX(sys64_time,compat_sys_time,sys_time)
SYSCALL(mknod)
@@ -69,20 +67,20 @@ SYSX(sys_ni_syscall,sys_oldumount,sys_oldumount)
SYSCALL(setuid)
SYSCALL(getuid)
COMPAT_SYS(stime)
-SYSCALL32(ptrace)
+COMPAT_SYS(ptrace)
SYSCALL(alarm)
OLDSYS(fstat)
-SYSCALL32(pause)
+COMPAT_SYS(pause)
COMPAT_SYS(utime)
SYSCALL(ni_syscall)
SYSCALL(ni_syscall)
-SYSCALL32(access)
-SYSCALL32(nice)
+COMPAT_SYS(access)
+COMPAT_SYS(nice)
SYSCALL(ni_syscall)
SYSCALL(sync)
-SYSCALL32(kill)
+COMPAT_SYS(kill)
SYSCALL(rename)
-SYSCALL32(mkdir)
+COMPAT_SYS(mkdir)
SYSCALL(rmdir)
SYSCALL(dup)
SYSCALL(pipe)
@@ -100,10 +98,10 @@ SYSCALL(ni_syscall)
COMPAT_SYS(ioctl)
COMPAT_SYS(fcntl)
SYSCALL(ni_syscall)
-SYSCALL32(setpgid)
+COMPAT_SYS(setpgid)
SYSCALL(ni_syscall)
SYSX(sys_ni_syscall,sys_olduname, sys_olduname)
-SYSCALL32(umask)
+COMPAT_SYS(umask)
SYSCALL(chroot)
SYSCALL(ustat)
SYSCALL(dup2)
@@ -112,23 +110,23 @@ SYSCALL(getpgrp)
SYSCALL(setsid)
SYS32ONLY(sigaction)
SYSCALL(sgetmask)
-SYSCALL32(ssetmask)
+COMPAT_SYS(ssetmask)
SYSCALL(setreuid)
SYSCALL(setregid)
SYSX(sys_ni_syscall,ppc32_sigsuspend,ppc_sigsuspend)
COMPAT_SYS(sigpending)
-SYSCALL32(sethostname)
+COMPAT_SYS(sethostname)
COMPAT_SYS(setrlimit)
COMPAT_SYS(old_getrlimit)
COMPAT_SYS(getrusage)
-SYSCALL32(gettimeofday)
-SYSCALL32(settimeofday)
-SYSCALL32(getgroups)
-SYSCALL32(setgroups)
+COMPAT_SYS(gettimeofday)
+COMPAT_SYS(settimeofday)
+COMPAT_SYS(getgroups)
+COMPAT_SYS(setgroups)
SYSX(sys_ni_syscall,sys_ni_syscall,ppc_select)
SYSCALL(symlink)
OLDSYS(lstat)
-SYSCALL32(readlink)
+COMPAT_SYS(readlink)
SYSCALL(uselib)
SYSCALL(swapon)
SYSCALL(reboot)
@@ -139,14 +137,14 @@ SYSCALL(truncate)
SYSCALL(ftruncate)
SYSCALL(fchmod)
SYSCALL(fchown)
-SYSCALL32(getpriority)
-SYSCALL32(setpriority)
+COMPAT_SYS(getpriority)
+COMPAT_SYS(setpriority)
SYSCALL(ni_syscall)
COMPAT_SYS(statfs)
COMPAT_SYS(fstatfs)
SYSCALL(ni_syscall)
COMPAT_SYS(socketcall)
-SYSCALL32(syslog)
+COMPAT_SYS(syslog)
COMPAT_SYS(setitimer)
COMPAT_SYS(getitimer)
COMPAT_SYS(newstat)
@@ -159,15 +157,15 @@ SYSCALL(ni_syscall)
SYSCALL(ni_syscall)
COMPAT_SYS(wait4)
SYSCALL(swapoff)
-SYSCALL32(sysinfo)
-SYSCALL32(ipc)
+COMPAT_SYS(sysinfo)
+COMPAT_SYS(ipc)
SYSCALL(fsync)
SYSX(sys_ni_syscall,ppc32_sigreturn,sys_sigreturn)
PPC_SYS(clone)
-SYSCALL32(setdomainname)
+COMPAT_SYS(setdomainname)
PPC_SYS(newuname)
SYSCALL(ni_syscall)
-SYSCALL32(adjtimex)
+COMPAT_SYS(adjtimex)
SYSCALL(mprotect)
SYSX(sys_ni_syscall,compat_sys_sigprocmask,sys_sigprocmask)
SYSCALL(ni_syscall)
@@ -175,36 +173,36 @@ SYSCALL(init_module)
SYSCALL(delete_module)
SYSCALL(ni_syscall)
SYSCALL(quotactl)
-SYSCALL32(getpgid)
+COMPAT_SYS(getpgid)
SYSCALL(fchdir)
SYSCALL(bdflush)
-SYSCALL32(sysfs)
+COMPAT_SYS(sysfs)
SYSX(ppc64_personality,ppc64_personality,sys_personality)
SYSCALL(ni_syscall)
SYSCALL(setfsuid)
SYSCALL(setfsgid)
SYSCALL(llseek)
-SYSCALL32(getdents)
+COMPAT_SYS(getdents)
SYSX(sys_select,ppc32_select,ppc_select)
SYSCALL(flock)
SYSCALL(msync)
COMPAT_SYS(readv)
COMPAT_SYS(writev)
-SYSCALL32(getsid)
+COMPAT_SYS(getsid)
SYSCALL(fdatasync)
-SYSCALL32(sysctl)
+COMPAT_SYS(sysctl)
SYSCALL(mlock)
SYSCALL(munlock)
SYSCALL(mlockall)
SYSCALL(munlockall)
-SYSCALL32(sched_setparam)
-SYSCALL32(sched_getparam)
-SYSCALL32(sched_setscheduler)
-SYSCALL32(sched_getscheduler)
+COMPAT_SYS(sched_setparam)
+COMPAT_SYS(sched_getparam)
+COMPAT_SYS(sched_setscheduler)
+COMPAT_SYS(sched_getscheduler)
SYSCALL(sched_yield)
-SYSCALL32(sched_get_priority_max)
-SYSCALL32(sched_get_priority_min)
-SYSCALL32(sched_rr_get_interval)
+COMPAT_SYS(sched_get_priority_max)
+COMPAT_SYS(sched_get_priority_min)
+COMPAT_SYS(sched_rr_get_interval)
COMPAT_SYS(nanosleep)
SYSCALL(mremap)
SYSCALL(setresuid)
@@ -214,36 +212,36 @@ SYSCALL(poll)
COMPAT_SYS(nfsservctl)
SYSCALL(setresgid)
SYSCALL(getresgid)
-SYSCALL32(prctl)
+COMPAT_SYS(prctl)
SYSX(ppc64_rt_sigreturn,ppc32_rt_sigreturn,sys_rt_sigreturn)
-SYSCALL32(rt_sigaction)
-SYSCALL32(rt_sigprocmask)
-SYSCALL32(rt_sigpending)
+COMPAT_SYS(rt_sigaction)
+COMPAT_SYS(rt_sigprocmask)
+COMPAT_SYS(rt_sigpending)
COMPAT_SYS(rt_sigtimedwait)
-SYSCALL32(rt_sigqueueinfo)
+COMPAT_SYS(rt_sigqueueinfo)
SYSX(ppc64_rt_sigsuspend,ppc32_rt_sigsuspend,ppc_rt_sigsuspend)
-SYSCALL32(pread64)
-SYSCALL32(pwrite64)
+COMPAT_SYS(pread64)
+COMPAT_SYS(pwrite64)
SYSCALL(chown)
SYSCALL(getcwd)
SYSCALL(capget)
SYSCALL(capset)
-SYSCALL32(sigaltstack)
-SYSX(sys_sendfile64,sys32_sendfile,sys_sendfile)
+COMPAT_SYS(sigaltstack)
+SYSX(sys_sendfile64,compat_sys_sendfile,sys_sendfile)
SYSCALL(ni_syscall)
SYSCALL(ni_syscall)
PPC_SYS(vfork)
COMPAT_SYS(getrlimit)
-SYSCALL32(readahead)
+COMPAT_SYS(readahead)
SYS32ONLY(mmap2)
SYS32ONLY(truncate64)
SYS32ONLY(ftruncate64)
SYSX(sys_ni_syscall,sys_stat64,sys_stat64)
SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64)
SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64)
-SYSCALL32(pciconfig_read)
-SYSCALL32(pciconfig_write)
-SYSCALL32(pciconfig_iobase)
+COMPAT_SYS(pciconfig_read)
+COMPAT_SYS(pciconfig_write)
+COMPAT_SYS(pciconfig_iobase)
SYSCALL(ni_syscall)
SYSCALL(getdents64)
SYSCALL(pivot_root)
@@ -293,8 +291,8 @@ COMPAT_SYS(clock_gettime)
COMPAT_SYS(clock_getres)
COMPAT_SYS(clock_nanosleep)
SYSX(ppc64_swapcontext,ppc32_swapcontext,ppc_swapcontext)
-SYSCALL32(tgkill)
-SYSCALL32(utimes)
+COMPAT_SYS(tgkill)
+COMPAT_SYS(utimes)
COMPAT_SYS(statfs64)
COMPAT_SYS(fstatfs64)
SYSX(sys_ni_syscall, ppc32_fadvise64_64, sys_fadvise64_64)
@@ -312,12 +310,12 @@ COMPAT_SYS(mq_timedreceive)
COMPAT_SYS(mq_notify)
COMPAT_SYS(mq_getsetattr)
COMPAT_SYS(kexec_load)
-SYSCALL32(add_key)
-SYSCALL32(request_key)
+COMPAT_SYS(add_key)
+COMPAT_SYS(request_key)
COMPAT_SYS(keyctl)
COMPAT_SYS(waitid)
-SYSCALL32(ioprio_set)
-SYSCALL32(ioprio_get)
+COMPAT_SYS(ioprio_set)
+COMPAT_SYS(ioprio_get)
SYSCALL(inotify_init)
SYSCALL(inotify_add_watch)
SYSCALL(inotify_rm_watch)