From b5b8a47a14100aaedf8554055888eb50158548fd Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 10 Jul 2007 11:24:12 +0200
Subject: [PATCH] --- yaml --- r: 58601 b: refs/heads/master c:
 d9f774d439cda5b46324221a47e6aaf7dc2f77cc h: refs/heads/master i:   58599:
 fc5ee4cf52df4332fb6dba64c43646837979557f v: v3

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

diff --git a/[refs] b/[refs]
index 0d7af8b794fc..fe4e957106d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf1a95a225c1349846274caebdca1bb8d20d5853
+refs/heads/master: d9f774d439cda5b46324221a47e6aaf7dc2f77cc
diff --git a/trunk/drivers/s390/char/zcore.c b/trunk/drivers/s390/char/zcore.c
index 4e711a985d59..3712ede16723 100644
--- a/trunk/drivers/s390/char/zcore.c
+++ b/trunk/drivers/s390/char/zcore.c
@@ -156,7 +156,7 @@ static int memcpy_real(void *dest, unsigned long src, size_t count)
 	return rc;
 }
 
-static int memcpy_real_user(__user void *dest, unsigned long src, size_t count)
+static int memcpy_real_user(void __user *dest, unsigned long src, size_t count)
 {
 	static char buf[4096];
 	int offs = 0, size;