Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / arch / microblaze / kernel / sys_microblaze.c

diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c
index 31905ff..b96f168 100644 (file)
--- a/arch/microblaze/kernel/sys_microblaze.c
+++ b/arch/microblaze/kernel/sys_microblaze.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
@@ -34,120 +33,21 @@
 #include <linux/unistd.h>
 
 #include <asm/syscalls.h>
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly. This will be remove with new toolchain.
- */
-asmlinkage int
-sys_ipc(uint call, int first, int second, int third, void *ptr, long fifth)
-{
-       int version, ret;
-
-       version = call >> 16; /* hack for backward compatibility */
-       call &= 0xffff;
-
-       ret = -EINVAL;
-       switch (call) {
-       case SEMOP:
-               ret = sys_semop(first, (struct sembuf *)ptr, second);
-               break;
-       case SEMGET:
-               ret = sys_semget(first, second, third);
-               break;
-       case SEMCTL:
-       {
-               union semun fourth;
-
-               if (!ptr)
-                       break;
-               ret = (access_ok(VERIFY_READ, ptr, sizeof(long)) ? 0 : -EFAULT)
-                               || (get_user(fourth.__pad, (void **)ptr)) ;
-               if (ret)
-                       break;
-               ret = sys_semctl(first, second, third, fourth);
-               break;
-       }
-       case MSGSND:
-               ret = sys_msgsnd(first, (struct msgbuf *) ptr, second, third);
-               break;
-       case MSGRCV:
-               switch (version) {
-               case 0: {
-                       struct ipc_kludge tmp;
-
-                       if (!ptr)
-                               break;
-                       ret = (access_ok(VERIFY_READ, ptr, sizeof(tmp))
-                               ? 0 : -EFAULT) || copy_from_user(&tmp,
-                               (struct ipc_kludge *) ptr, sizeof(tmp));
-                       if (ret)
-                               break;
-                       ret = sys_msgrcv(first, tmp.msgp, second, tmp.msgtyp,
-                                       third);
-                       break;
-                       }
-               default:
-                       ret = sys_msgrcv(first, (struct msgbuf *) ptr,
-                                       second, fifth, third);
-                       break;
-               }
-               break;
-       case MSGGET:
-               ret = sys_msgget((key_t) first, second);
-               break;
-       case MSGCTL:
-               ret = sys_msgctl(first, second, (struct msqid_ds *) ptr);
-               break;
-       case SHMAT:
-               switch (version) {
-               default: {
-                       ulong raddr;
-                       ret = access_ok(VERIFY_WRITE, (ulong *) third,
-                                       sizeof(ulong)) ? 0 : -EFAULT;
-                       if (ret)
-                               break;
-                       ret = do_shmat(first, (char *) ptr, second, &raddr);
-                       if (ret)
-                               break;
-                       ret = put_user(raddr, (ulong *) third);
-                       break;
-                       }
-               case 1: /* iBCS2 emulator entry point */
-                       if (!segment_eq(get_fs(), get_ds()))
-                               break;
-                       ret = do_shmat(first, (char *) ptr, second,
-                                       (ulong *) third);
-                       break;
-               }
-               break;
-       case SHMDT:
-               ret = sys_shmdt((char *)ptr);
-               break;
-       case SHMGET:
-               ret = sys_shmget(first, second, third);
-               break;
-       case SHMCTL:
-               ret = sys_shmctl(first, second, (struct shmid_ds *) ptr);
-               break;
-       }
-       return ret;
-}
 
-asmlinkage int sys_vfork(struct pt_regs *regs)
+asmlinkage long microblaze_vfork(struct pt_regs *regs)
 {
        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->r1,
                                                regs, 0, NULL, NULL);
 }
 
-asmlinkage int sys_clone(int flags, unsigned long stack, struct pt_regs *regs)
+asmlinkage long microblaze_clone(int flags, unsigned long stack, struct pt_regs *regs)
 {
        if (!stack)
                stack = regs->r1;
        return do_fork(flags, stack, regs, 0, NULL, NULL);
 }
 
-asmlinkage int sys_execve(char __user *filenamei, char __user *__user *argv,
+asmlinkage long microblaze_execve(char __user *filenamei, char __user *__user *argv,
                        char __user *__user *envp, struct pt_regs *regs)
 {
        int error;
@@ -163,8 +63,8 @@ out:
        return error;
 }
 
-asmlinkage unsigned long
-sys_mmap2(unsigned long addr, size_t len,
+asmlinkage long
+sys_mmap2(unsigned long addr, unsigned long len,
        unsigned long prot, unsigned long flags,
        unsigned long fd, unsigned long pgoff)
 {
@@ -189,18 +89,18 @@ out:
        return ret;
 }
 
-asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len,
+asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
                        unsigned long prot, unsigned long flags,
-                       unsigned long fd, off_t offset)
+                       unsigned long fd, off_t pgoff)
 {
        int err = -EINVAL;
 
-       if (offset & ~PAGE_MASK) {
+       if (pgoff & ~PAGE_MASK) {
                printk(KERN_INFO "no pagemask in mmap\r\n");
                goto out;
        }
 
-       err = sys_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
+       err = sys_mmap2(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
 out:
        return err;
 }