diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /arch/mips/kernel/irixelf.c | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'arch/mips/kernel/irixelf.c')
| -rw-r--r-- | arch/mips/kernel/irixelf.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index a64ebd1f6..b29bc0563 100644 --- a/arch/mips/kernel/irixelf.c +++ b/arch/mips/kernel/irixelf.c @@ -447,7 +447,8 @@ static inline int look_for_irix_interpreter(char **name, struct elf_phdr *epp, struct linux_binprm *bprm, int pnum) { - int i, old_fs; + mm_segment_t old_fs; + int i; int retval = -EINVAL; struct dentry *dentry = NULL; @@ -551,7 +552,7 @@ static inline void map_executable(struct file *fp, struct elf_phdr *epp, int pnu static inline int map_interpreter(struct elf_phdr *epp, struct elfhdr *ihp, struct dentry *identry, unsigned int *iladdr, - int pnum, int old_fs, + int pnum, mm_segment_t old_fs, unsigned int *eentry) { int i; @@ -616,8 +617,9 @@ static inline int do_load_irix_binary(struct linux_binprm * bprm, unsigned int load_addr, elf_bss, elf_brk; unsigned int elf_entry, interp_load_addr = 0; unsigned int start_code, end_code, end_data, elf_stack; - int old_fs, elf_exec_fileno, retval, has_interp, has_ephdr, i; + int elf_exec_fileno, retval, has_interp, has_ephdr, i; char *elf_interpreter; + mm_segment_t old_fs; load_addr = 0; has_interp = has_ephdr = 0; @@ -1124,7 +1126,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs) struct file file; struct dentry *dentry; struct inode *inode; - unsigned short fs; + mm_segment_t fs; char corefile[6+sizeof(current->comm)]; int segs; int i; |