diff --git a/[refs] b/[refs] index a385f9af6c07..6c94fed96df2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2ef79e1840ebbd0b5907e53c755efd5662112a1 +refs/heads/master: 5db92850d3ab72b830a0fe6e30eaec8462801408 diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index c374be51b041..f8f6b6b76179 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -1125,7 +1125,7 @@ static int dump_write(struct file *file, const void *addr, int nr) return file->f_op->write(file, addr, nr, &file->f_pos) == nr; } -static int dump_seek(struct file *file, off_t off) +static int dump_seek(struct file *file, loff_t off) { if (file->f_op->llseek) { if (file->f_op->llseek(file, off, 0) != off)