Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / mips / kernel / syscall.c

diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 0080107..1375fe8 100644 (file)
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -7,7 +7,6 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  * Copyright (C) 2001 MIPS Technologies, Inc.
  */
-#include <linux/config.h>
 #include <linux/a.out.h>
 #include <linux/capability.h>
 #include <linux/errno.h>
@@ -304,7 +303,7 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
  *
  * This is really horribly ugly.
  */
-asmlinkage int sys_ipc (uint call, int first, int second,
+asmlinkage int sys_ipc (unsigned int call, int first, int second,
                        unsigned long third, void __user *ptr, long fifth)
 {
        int version, ret;
@@ -362,18 +361,18 @@ asmlinkage int sys_ipc (uint call, int first, int second,
        case SHMAT:
                switch (version) {
                default: {
-                       ulong raddr;
+                       unsigned long raddr;
                        ret = do_shmat (first, (char __user *) ptr, second,
                                        &raddr);
                        if (ret)
                                return ret;
-                       return put_user (raddr, (ulong __user *) third);
+                       return put_user (raddr, (unsigned long __user *) third);
                }
                case 1: /* iBCS2 emulator entry point */
                        if (!segment_eq(get_fs(), get_ds()))
                                return -EINVAL;
                        return do_shmat (first, (char __user *) ptr, second,
-                                        (ulong *) third);
+                                        (unsigned long *) third);
                }
        case SHMDT:
                return sys_shmdt ((char __user *)ptr);