summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2011-10-30 15:17:21 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2011-10-30 15:16:47 +0100
commit07ea815b22b9f70ec8de6ddf8db63a1dd1585caf (patch)
treee30015ef66661f3bb112136d42ea2dee86393d81 /arch/s390
parent5f4026f8b2e4c5e26713d6c707592a33326a88c4 (diff)
[S390] Remove error checking from copy_oldmem_page()
Currently it can happen that the pre-allocated ELF header contains a wrong memory map which would result in errors when copying /proc/vmcore. In order to still get a valid vmcore, we (temporarily) disable the error checking in copy_oldmem_page(). This will then produce zero pages for those memory regions. Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/crash_dump.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
index 2a9a3f405574..39f8fd4438fc 100644
--- a/arch/s390/kernel/crash_dump.c
+++ b/arch/s390/kernel/crash_dump.c
@@ -31,7 +31,6 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
size_t csize, unsigned long offset, int userbuf)
{
unsigned long src;
- int rc;
if (!csize)
return 0;
@@ -43,11 +42,11 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
src < OLDMEM_BASE + OLDMEM_SIZE)
src -= OLDMEM_BASE;
if (userbuf)
- rc = copy_to_user_real((void __user *) buf, (void *) src,
- csize);
+ copy_to_user_real((void __force __user *) buf, (void *) src,
+ csize);
else
- rc = memcpy_real(buf, (void *) src, csize);
- return rc < 0 ? rc : csize;
+ memcpy_real(buf, (void *) src, csize);
+ return csize;
}
/*