mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-12-28 23:35:17 +00:00
[PATCH] binfmt_elf: consistently use loff_t
As David Howells <dhowells@redhat.com> points out, binfmt_elf sometimes uses off_t, sometimes uses loff_t. Use loff_t throughout. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
b20c8122a3
commit
8d6b5eeea5
@ -1262,7 +1262,7 @@ static void fill_elf_header(struct elfhdr *elf, int segs)
|
||||
return;
|
||||
}
|
||||
|
||||
static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, off_t offset)
|
||||
static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
|
||||
{
|
||||
phdr->p_type = PT_NOTE;
|
||||
phdr->p_offset = offset;
|
||||
@ -1428,7 +1428,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
|
||||
int i;
|
||||
struct vm_area_struct *vma;
|
||||
struct elfhdr *elf = NULL;
|
||||
off_t offset = 0, dataoff;
|
||||
loff_t offset = 0, dataoff;
|
||||
unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
|
||||
int numnote;
|
||||
struct memelfnote *notes = NULL;
|
||||
@ -1661,11 +1661,11 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
|
||||
ELF_CORE_WRITE_EXTRA_DATA;
|
||||
#endif
|
||||
|
||||
if ((off_t)file->f_pos != offset) {
|
||||
if (file->f_pos != offset) {
|
||||
/* Sanity check */
|
||||
printk(KERN_WARNING
|
||||
"elf_core_dump: file->f_pos (%ld) != offset (%ld)\n",
|
||||
(off_t)file->f_pos, offset);
|
||||
"elf_core_dump: file->f_pos (%Ld) != offset (%Ld)\n",
|
||||
file->f_pos, offset);
|
||||
}
|
||||
|
||||
end_coredump:
|
||||
|
Loading…
Reference in New Issue
Block a user