Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6.git] / arch / microblaze / kernel / sys_microblaze.c

diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c
index e000bce09b2bda6e41066e1ad77af992366a87be..9f3c205fb75b71c47086f21f9e80863b6dcd14df 100644 (file)
--- a/arch/microblaze/kernel/sys_microblaze.c
+++ b/arch/microblaze/kernel/sys_microblaze.c
@@ -23,7 +23,6 @@
 #include <linux/mman.h>
 #include <linux/sys.h>
 #include <linux/ipc.h>
-#include <linux/utsname.h>
 #include <linux/file.h>
 #include <linux/module.h>
 #include <linux/err.h>
@@ -33,105 +32,6 @@
 #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 long
-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 long microblaze_vfork(struct pt_regs *regs)
 {
@@ -162,46 +62,14 @@ out:
        return error;
 }
 
-asmlinkage long
-sys_mmap2(unsigned long addr, unsigned long len,
-       unsigned long prot, unsigned long flags,
-       unsigned long fd, unsigned long pgoff)
-{
-       struct file *file = NULL;
-       int ret = -EBADF;
-
-       flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-       if (!(flags & MAP_ANONYMOUS)) {
-               file = fget(fd);
-               if (!file) {
-                       printk(KERN_INFO "no fd in mmap\r\n");
-                       goto out;
-               }
-       }
-
-       down_write(&current->mm->mmap_sem);
-       ret = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-       up_write(&current->mm->mmap_sem);
-       if (file)
-               fput(file);
-out:
-       return ret;
-}
-
 asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
                        unsigned long prot, unsigned long flags,
                        unsigned long fd, off_t pgoff)
 {
-       int err = -EINVAL;
-
-       if (pgoff & ~PAGE_MASK) {
-               printk(KERN_INFO "no pagemask in mmap\r\n");
-               goto out;
-       }
+       if (pgoff & ~PAGE_MASK)
+               return -EINVAL;
 
-       err = sys_mmap2(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
-out:
-       return err;
+       return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
 }
 
 /*