---

yaml --- r: 323974 b: refs/heads/master c: 3d13340 h: refs/heads/master v: v3
git-mirror · Sep 5, 2012 · ade589a · ade589a
1 parent 9fd8c86
commit ade589a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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