---

yaml --- r: 272100 b: refs/heads/master c: 07ea815 h: refs/heads/master v: v3
git-mirror · Oct 30, 2011 · 879dd1a · 879dd1a
1 parent 3e768c6
commit 879dd1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f4026f8b2e4c5e26713d6c707592a33326a88c4
+refs/heads/master: 07ea815b22b9f70ec8de6ddf8db63a1dd1585caf
diff --git a/trunk/arch/s390/kernel/crash_dump.c b/trunk/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;
 }
 
 /*