From ade589aab9cbc34b7d8cfa56ecd8552a9e8e4c36 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Sun, 2 Sep 2012 23:31:41 +0200
Subject: [PATCH] --- yaml --- r: 323974 b: refs/heads/master c:
 3d1334064fb365ea8f299874c2b4c46de2bee74d h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/include/asm/vdso.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f213d0778355..4d1a36a906f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f00026276ace77dcad1cdf17f696ae4e56e12ee6
+refs/heads/master: 3d1334064fb365ea8f299874c2b4c46de2bee74d
diff --git a/trunk/arch/x86/include/asm/vdso.h b/trunk/arch/x86/include/asm/vdso.h
index bb0522850b74..fddb53d63915 100644
--- a/trunk/arch/x86/include/asm/vdso.h
+++ b/trunk/arch/x86/include/asm/vdso.h
@@ -11,7 +11,8 @@ extern const char VDSO32_PRELINK[];
 #define VDSO32_SYMBOL(base, name)					\
 ({									\
 	extern const char VDSO32_##name[];				\
-	(void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
+	(void __user *)(VDSO32_##name - VDSO32_PRELINK +		\
+			(unsigned long)(base));				\
 })
 #endif