From: Mathias Krause Date: Sun, 2 Sep 2012 21:31:41 +0000 (+0200) Subject: x86/vdso: Add __user annotation to VDSO32_SYMBOL X-Git-Tag: MMI-PSA29.97-13-9~15911^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d1334064fb365ea8f299874c2b4c46de2bee74d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Cc: Andy Lutomirski Link: http://lkml.kernel.org/r/1346621506-30857-3-git-send-email-minipli@googlemail.com Signed-off-by: Ingo Molnar --- 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