diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
| commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
| tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /fs/binfmt_elf.c | |
| parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index c374be51b041..f8f6b6b76179 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -1125,7 +1125,7 @@ static int dump_write(struct file *file, const void *addr, int nr) | |||
| 1125 | return file->f_op->write(file, addr, nr, &file->f_pos) == nr; | 1125 | return file->f_op->write(file, addr, nr, &file->f_pos) == nr; |
| 1126 | } | 1126 | } |
| 1127 | 1127 | ||
| 1128 | static int dump_seek(struct file *file, off_t off) | 1128 | static int dump_seek(struct file *file, loff_t off) |
| 1129 | { | 1129 | { |
| 1130 | if (file->f_op->llseek) { | 1130 | if (file->f_op->llseek) { |
| 1131 | if (file->f_op->llseek(file, off, 0) != off) | 1131 | if (file->f_op->llseek(file, off, 0) != off) |