diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/kstat.h | 8 | ||||
-rw-r--r-- | arch/mips/syscall_arch.h | 46 |
2 files changed, 10 insertions, 44 deletions
diff --git a/arch/mips/kstat.h b/arch/mips/kstat.h index 96e4ea34..5e637eab 100644 --- a/arch/mips/kstat.h +++ b/arch/mips/kstat.h @@ -1,13 +1,13 @@ struct kstat { - dev_t st_dev; - long __st_padding1[2]; + unsigned st_dev; + long __st_padding1[3]; ino_t st_ino; mode_t st_mode; nlink_t st_nlink; uid_t st_uid; gid_t st_gid; - dev_t st_rdev; - long __st_padding2[2]; + unsigned st_rdev; + long __st_padding2[3]; off_t st_size; long st_atime_sec; long st_atime_nsec; diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h index 43bcdee7..e4854f50 100644 --- a/arch/mips/syscall_arch.h +++ b/arch/mips/syscall_arch.h @@ -5,18 +5,6 @@ #define SYSCALL_RLIM_INFINITY (-1UL/2) -#if _MIPSEL || __MIPSEL || __MIPSEL__ -#define __stat_fix(st) ((st),(void)0) -#else -#include <sys/stat.h> -static inline void __stat_fix(long p) -{ - struct stat *st = (struct stat *)p; - st->st_dev >>= 32; - st->st_rdev >>= 32; -} -#endif - static inline long __syscall0(long n) { register long r7 __asm__("$7"); @@ -55,10 +43,7 @@ static inline long __syscall2(long n, long a, long b) "r"(r4), "r"(r5) : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall3(long n, long a, long b, long c) @@ -74,10 +59,7 @@ static inline long __syscall3(long n, long a, long b, long c) "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall4(long n, long a, long b, long c, long d) @@ -93,11 +75,7 @@ static inline long __syscall4(long n, long a, long b, long c, long d) "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall5(long n, long a, long b, long c, long d, long e) @@ -116,11 +94,7 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e) : "ir"(n), "0"(r2), "1"(r7), "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return r2; + return r7 ? -r2 : r2; } static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f) @@ -140,11 +114,7 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo : "ir"(n), "0"(r2), "1"(r7), "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return r2; + return r7 ? -r2 : r2; } static inline long __syscall7(long n, long a, long b, long c, long d, long e, long f, long g) @@ -165,11 +135,7 @@ static inline long __syscall7(long n, long a, long b, long c, long d, long e, lo : "ir"(n), "0"(r2), "1"(r7), "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return r2; + return r7 ? -r2 : r2; } #define VDSO_USEFUL |