aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-07-10 11:24:12 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-07-10 11:24:45 +0200
commitd9f774d439cda5b46324221a47e6aaf7dc2f77cc (patch)
tree362e02c8e5993d1685c84db4755513c3f1f6fa73
parentbf1a95a225c1349846274caebdca1bb8d20d5853 (diff)
downloadlinux-2.6.34-ux500-d9f774d439cda5b46324221a47e6aaf7dc2f77cc.tar.gz
[S390] zcore: Fix __user annotation.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--drivers/s390/char/zcore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 4e711a985d5..3712ede1672 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;