From 7c8e78de5af7f8e549f16871ef516d0e92147280 Mon Sep 17 00:00:00 2001
From: Michael Holzheu <holzheu@de.ibm.com>
Date: Fri, 12 Oct 2007 16:11:44 +0200
Subject: [PATCH] --- yaml --- r: 67634 b: refs/heads/master c:
 53a0868cb4d77dcba8e95e1033361ffdb6e510e2 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/s390/char/zcore.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 33f2bd573ec2..0619fb01f3d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cebe0fe70fbf033a1a6b7c5c8b79eb13060a4ab7
+refs/heads/master: 53a0868cb4d77dcba8e95e1033361ffdb6e510e2
diff --git a/trunk/drivers/s390/char/zcore.c b/trunk/drivers/s390/char/zcore.c
index 3712ede16723..7073daf77981 100644
--- a/trunk/drivers/s390/char/zcore.c
+++ b/trunk/drivers/s390/char/zcore.c
@@ -141,15 +141,16 @@ static int memcpy_real(void *dest, unsigned long src, size_t count)
 
 	if (count == 0)
 		return 0;
-	flags = __raw_local_irq_stnsm(0xf8); /* switch to real mode */
+	flags = __raw_local_irq_stnsm(0xf8UL); /* switch to real mode */
 	asm volatile (
 		"0:	mvcle	%1,%2,0x0\n"
 		"1:	jo	0b\n"
 		"	lhi	%0,0x0\n"
 		"2:\n"
 		EX_TABLE(1b,2b)
-		: "+d" (rc)
-		: "d" (_dest), "d" (_src), "d" (_len1), "d" (_len2)
+		: "+d" (rc), "+d" (_dest), "+d" (_src), "+d" (_len1),
+		  "+d" (_len2), "=m" (*((long*)dest))
+		: "m" (*((long*)src))
 		: "cc", "memory");
 	__raw_local_irq_ssm(flags);