diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-03-01 14:22:29 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:30:50 -0400 |
commit | fe00f943e0ef98b4057abcc2940d631a975b43cd (patch) | |
tree | c036ab8269ac86485130a083330229a01d319557 /arch/mips/kernel/irixelf.c | |
parent | 14f18b7f7e58de9a34c4b5fd38d5f73f22fba7ac (diff) |
Sparseify MIPS.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/irixelf.c')
-rw-r--r-- | arch/mips/kernel/irixelf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index 881f125eecb4..5aeacc1ffb24 100644 --- a/arch/mips/kernel/irixelf.c +++ b/arch/mips/kernel/irixelf.c | |||
@@ -147,7 +147,7 @@ static void padzero(unsigned long elf_bss) | |||
147 | nbyte = elf_bss & (PAGE_SIZE-1); | 147 | nbyte = elf_bss & (PAGE_SIZE-1); |
148 | if (nbyte) { | 148 | if (nbyte) { |
149 | nbyte = PAGE_SIZE - nbyte; | 149 | nbyte = PAGE_SIZE - nbyte; |
150 | clear_user((void *) elf_bss, nbyte); | 150 | clear_user((void __user *) elf_bss, nbyte); |
151 | } | 151 | } |
152 | } | 152 | } |
153 | 153 | ||
@@ -878,10 +878,10 @@ static int load_irix_library(struct file *file) | |||
878 | * phdrs there are in the USER_PHDRP array. We return the vaddr the | 878 | * phdrs there are in the USER_PHDRP array. We return the vaddr the |
879 | * first phdr was successfully mapped to. | 879 | * first phdr was successfully mapped to. |
880 | */ | 880 | */ |
881 | unsigned long irix_mapelf(int fd, struct elf_phdr *user_phdrp, int cnt) | 881 | unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt) |
882 | { | 882 | { |
883 | unsigned long type, vaddr, filesz, offset, flags; | 883 | unsigned long type, vaddr, filesz, offset, flags; |
884 | struct elf_phdr *hp; | 884 | struct elf_phdr __user *hp; |
885 | struct file *filp; | 885 | struct file *filp; |
886 | int i, retval; | 886 | int i, retval; |
887 | 887 | ||
@@ -968,9 +968,9 @@ unsigned long irix_mapelf(int fd, struct elf_phdr *user_phdrp, int cnt) | |||
968 | /* These are the only things you should do on a core-file: use only these | 968 | /* These are the only things you should do on a core-file: use only these |
969 | * functions to write out all the necessary info. | 969 | * functions to write out all the necessary info. |
970 | */ | 970 | */ |
971 | static int dump_write(struct file *file, const void *addr, int nr) | 971 | static int dump_write(struct file *file, const void __user *addr, int nr) |
972 | { | 972 | { |
973 | return file->f_op->write(file, (const char *) addr, nr, &file->f_pos) == nr; | 973 | return file->f_op->write(file, (const char __user *) addr, nr, &file->f_pos) == nr; |
974 | } | 974 | } |
975 | 975 | ||
976 | static int dump_seek(struct file *file, off_t off) | 976 | static int dump_seek(struct file *file, off_t off) |
@@ -1204,7 +1204,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file) | |||
1204 | len = current->mm->arg_end - current->mm->arg_start; | 1204 | len = current->mm->arg_end - current->mm->arg_start; |
1205 | len = len >= ELF_PRARGSZ ? ELF_PRARGSZ : len; | 1205 | len = len >= ELF_PRARGSZ ? ELF_PRARGSZ : len; |
1206 | (void *) copy_from_user(&psinfo.pr_psargs, | 1206 | (void *) copy_from_user(&psinfo.pr_psargs, |
1207 | (const char *)current->mm->arg_start, len); | 1207 | (const char __user *)current->mm->arg_start, len); |
1208 | for (i = 0; i < len; i++) | 1208 | for (i = 0; i < len; i++) |
1209 | if (psinfo.pr_psargs[i] == 0) | 1209 | if (psinfo.pr_psargs[i] == 0) |
1210 | psinfo.pr_psargs[i] = ' '; | 1210 | psinfo.pr_psargs[i] = ' '; |
@@ -1301,7 +1301,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file) | |||
1301 | #ifdef DEBUG | 1301 | #ifdef DEBUG |
1302 | printk("elf_core_dump: writing %08lx %lx\n", addr, len); | 1302 | printk("elf_core_dump: writing %08lx %lx\n", addr, len); |
1303 | #endif | 1303 | #endif |
1304 | DUMP_WRITE((void *)addr, len); | 1304 | DUMP_WRITE((void __user *)addr, len); |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | if ((off_t) file->f_pos != offset) { | 1307 | if ((off_t) file->f_pos != offset) { |