diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /arch/mips/kernel/sysirix.c | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/mips/kernel/sysirix.c')
| -rw-r--r-- | arch/mips/kernel/sysirix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index 90f2f49f4..9b910d4e7 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c @@ -1622,7 +1622,7 @@ asmlinkage int irix_mmap64(struct pt_regs *regs) pgoff = (off1 << (32 - PAGE_SHIFT)) | (off2 >> PAGE_SHIFT); if (!(flags & MAP_ANONYMOUS)) { - if (!(file = fcheck(fd))) { + if (!(file = fget(fd))) { error = -EBADF; goto out; } @@ -1847,7 +1847,7 @@ struct irix_dirent32_callback { #define ROUND_UP32(x) (((x)+sizeof(u32)-1) & ~(sizeof(u32)-1)) static int irix_filldir32(void *__buf, const char *name, int namlen, - off_t offset, ino_t ino) + off_t offset, ino_t ino, unsigned int d_type) { struct irix_dirent32 *dirent; struct irix_dirent32_callback *buf = @@ -1943,7 +1943,7 @@ struct irix_dirent64_callback { #define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1)) static int irix_filldir64(void * __buf, const char * name, int namlen, - off_t offset, ino_t ino) + off_t offset, ino_t ino, unsigned int d_type) { struct irix_dirent64 *dirent; struct irix_dirent64_callback * buf = |