[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20091222171741.11854.71709.stgit@warthog.procyon.org.uk>
Date: Tue, 22 Dec 2009 17:17:41 +0000
From: David Howells <dhowells@...hat.com>
To: torvalds@...l.org, akpm@...ux-foundation.org
Cc: linux-kernel@...r.kernel.org, uclinux-dev@...inux.org,
Daisuke HATAYAMA <d.hatayama@...fujitsu.com>,
Paul Mundt <lethal@...ux-sh.org>,
David Howells <dhowells@...hat.com>
Subject: [PATCH 4/4] elf_fdpic_core_dump(): fix build break in 2.6.33-rc1
From: Daisuke HATAYAMA <d.hatayama@...fujitsu.com>
Commit f6151dfea21496d43dbaba32cfcd9c9f404769bc causes ELF-FDPIC to break
during building, so this patch fixes it together with a correction for the
printk format.
Signed-off-by: Daisuke HATAYAMA <d.hatayama@...fujitsu.com>
Reviewed-by: Masami Hiramatsu <mhiramat@...hat.com>
Acked-by: Paul Mundt <lethal@...ux-sh.org>
Signed-off-by: David Howells <dhowells@...hat.com>
---
fs/binfmt_elf_fdpic.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 2917ab1..384a19f 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1807,11 +1807,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);
+ printk(KERN_WARNING "elf_fdpic_core_dump:"
+ " cprm->file->f_pos (%lld) != offset (%lld)\n",
+ cprm->file->f_pos, offset);
}
end_coredump:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists