summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-04 12:32:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-04 12:32:09 -0800
commitd4d3b19212a1045ff8224e680375076b3677ede7 (patch)
treea6ef0044ca7afbc3ddb631a2e158cc8a3b7ba7ba /fs
parente43c259777999d19532cf418ca69ce1288b42edc (diff)
parent2f48912d1443a796f10c42c89cb386f0e3eca04d (diff)
downloadlinux-3.10-d4d3b19212a1045ff8224e680375076b3677ede7.tar.gz
linux-3.10-d4d3b19212a1045ff8224e680375076b3677ede7.tar.bz2
linux-3.10-d4d3b19212a1045ff8224e680375076b3677ede7.zip
Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: binfmt_elf_fdpic: Fix build breakage introduced by coredump changes. sh: update defconfigs. sh: Don't default enable PMB support. sh: Disable PMB for SH4AL-DSP CPUs. sh: Only provide a PCLK definition for legacy CPG CPUs.
Diffstat (limited to 'fs')
-rw-r--r--fs/binfmt_elf_fdpic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index c25256a5c5b..7dc85997e96 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1798,11 +1798,11 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
ELF_CORE_WRITE_EXTRA_DATA;
#endif
- if (file->f_pos != offset) {
+ if (cprm->file->f_pos != offset) {
/* Sanity check */
printk(KERN_WARNING
"elf_core_dump: file->f_pos (%lld) != offset (%lld)\n",
- file->f_pos, offset);
+ cprm->file->f_pos, offset);
}
end_coredump: