From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 10 Jul 2007 09:24:12 +0000 (+0200)
Subject: [S390] zcore: Fix __user annotation.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9f774d439cda5b46324221a47e6aaf7dc2f77cc;p=linux-beck.git

[S390] zcore: Fix __user annotation.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 4e711a985d59..3712ede16723 100644
--- a/drivers/s390/char/zcore.c
+++ b/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;