summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/vdso.h
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-09-03 01:31:41 +0400
committerIngo Molnar <mingo@kernel.org>2012-09-05 12:52:23 +0400
commit3d1334064fb365ea8f299874c2b4c46de2bee74d (patch)
tree6b49a371a4045acb696ccac430f210224e2c4020 /arch/x86/include/asm/vdso.h
parentf00026276ace77dcad1cdf17f696ae4e56e12ee6 (diff)
downloadlinux-3d1334064fb365ea8f299874c2b4c46de2bee74d.tar.xz
x86/vdso: Add __user annotation to VDSO32_SYMBOL
The address calculated by VDSO32_SYMBOL() is a pointer into userland. Add the __user annotation to fix related sparse warnings in its users. Signed-off-by: Mathias Krause <minipli@googlemail.com> Cc: Andy Lutomirski <luto@MIT.EDU> Link: http://lkml.kernel.org/r/1346621506-30857-3-git-send-email-minipli@googlemail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/vdso.h')
-rw-r--r--arch/x86/include/asm/vdso.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
index bb0522850b74..fddb53d63915 100644
--- a/arch/x86/include/asm/vdso.h
+++ b/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