Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / arch / powerpc / kernel / syscalls.c

diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 7a23721..9b69d99 100644 (file)
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -40,12 +40,10 @@
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
 #include <asm/semaphore.h>
+#include <asm/syscalls.h>
 #include <asm/time.h>
 #include <asm/unistd.h>
 
-extern unsigned long wall_jiffies;
-
-
 /*
  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
  *
@@ -162,7 +160,7 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
                        unsigned long fd, unsigned long off, int shift)
 {
        struct file * file = NULL;
-       int ret = -EINVAL;
+       unsigned long ret = -EINVAL;
 
        if (shift) {
                if (off & ((1 << shift) - 1))
@@ -247,7 +245,7 @@ long ppc64_personality(unsigned long personality)
 #define OVERRIDE_MACHINE    0
 #endif
 
-static inline int override_machine(char *mach)
+static inline int override_machine(char __user *mach)
 {
        if (OVERRIDE_MACHINE) {
                /* change ppc64 to ppc */
@@ -311,31 +309,6 @@ int sys_olduname(struct oldold_utsname __user *name)
        return error? -EFAULT: 0;
 }
 
-#ifdef CONFIG_PPC64
-time_t sys64_time(time_t __user * tloc)
-{
-       time_t secs;
-       time_t usecs;
-
-       long tb_delta = tb_ticks_since(tb_last_stamp);
-       tb_delta += (jiffies - wall_jiffies) * tb_ticks_per_jiffy;
-
-       secs  = xtime.tv_sec;  
-       usecs = (xtime.tv_nsec/1000) + tb_delta / tb_ticks_per_usec;
-       while (usecs >= USEC_PER_SEC) {
-               ++secs;
-               usecs -= USEC_PER_SEC;
-       }
-
-       if (tloc) {
-               if (put_user(secs,tloc))
-                       secs = -EFAULT;
-       }
-
-       return secs;
-}
-#endif
-
 long ppc_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low,
                      u32 len_high, u32 len_low)
 {