From 2884808be1556234da920e520ed62bb299d351f3 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 29 Jan 2008 10:15:02 +0000 Subject: [PATCH] --- yaml --- r: 78059 b: refs/heads/master c: d4e9cffa161da806cb4bc9df4a4e49d287156bfa h: refs/heads/master i: 78057: 283eddd44e7db348bf29c24eec550c8e532d1628 78055: 29c21b211b3e0812ce8a63db8eee0beb65d32f92 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/linux32.c | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 1dc91d6a4078..0e9767576c50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e8774b621513e3cc07fa5a7b05adc295c95eeee +refs/heads/master: d4e9cffa161da806cb4bc9df4a4e49d287156bfa diff --git a/trunk/arch/mips/kernel/linux32.c b/trunk/arch/mips/kernel/linux32.c index 2b8ec1102e86..65af3cc90abb 100644 --- a/trunk/arch/mips/kernel/linux32.c +++ b/trunk/arch/mips/kernel/linux32.c @@ -174,36 +174,16 @@ struct rlimit32 { int rlim_max; }; -#ifdef __MIPSEB__ -asmlinkage long sys32_truncate64(const char __user * path, unsigned long __dummy, - int length_hi, int length_lo) -#endif -#ifdef __MIPSEL__ -asmlinkage long sys32_truncate64(const char __user * path, unsigned long __dummy, - int length_lo, int length_hi) -#endif +asmlinkage long sys32_truncate64(const char __user * path, + unsigned long __dummy, int a2, int a3) { - loff_t length; - - length = ((unsigned long) length_hi << 32) | (unsigned int) length_lo; - - return sys_truncate(path, length); + return sys_truncate(path, merge_64(a2, a3)); } -#ifdef __MIPSEB__ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long __dummy, - int length_hi, int length_lo) -#endif -#ifdef __MIPSEL__ -asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long __dummy, - int length_lo, int length_hi) -#endif + int a2, int a3) { - loff_t length; - - length = ((unsigned long) length_hi << 32) | (unsigned int) length_lo; - - return sys_ftruncate(fd, length); + return sys_ftruncate(fd, merge_64(a2, a3)); } static inline long