lkml.org 
[lkml]   [2014]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v11 7/9] introduce VVAR marco for vdso32
On Tue, Feb 4, 2014 at 2:15 AM,  <stefani@seibold.net> wrote:
> From: Stefani Seibold <stefani@seibold.net>
>
> This patch revamp the vvar.h for introduce the VVAR macro for vdso32.

I like this approach better. Thanks.

>
> Signed-off-by: Stefani Seibold <stefani@seibold.net>
> ---
> arch/x86/include/asm/vvar.h | 32 +++++++++++++++++++++-----------
> 1 file changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/arch/x86/include/asm/vvar.h b/arch/x86/include/asm/vvar.h
> index 7cd69af..bf13dc5 100644
> --- a/arch/x86/include/asm/vvar.h
> +++ b/arch/x86/include/asm/vvar.h
> @@ -16,15 +16,6 @@
> * you mess up, the linker will catch it.)
> */
>
> -/* Base address of vvars. This is not ABI. */
> -#ifdef CONFIG_X86_64
> -#define VVAR_ADDRESS (-10*1024*1024 - 4096)
> -#else
> -extern char __vvar_page;
> -
> -#define VVAR_ADDRESS (&__vvar_page)
> -#endif
> -
> #if defined(__VVAR_KERNEL_LDS)
>
> /* The kernel linker script defines its own magic to put vvars in the
> @@ -35,16 +26,35 @@ extern char __vvar_page;
>
> #else
>
> +#ifdef BUILD_VDSO32
> +
> +#define DECLARE_VVAR(offset, type, name) \
> + extern type vvar_ ## name __attribute__((visibility("hidden")));
> +
> +#define VVAR(name) (vvar_ ## name)
> +
> +#else
> +
> +/* Base address of vvars. This is not ABI. */
> +#ifdef CONFIG_X86_64
> +#define VVAR_ADDRESS (-10*1024*1024 - 4096)
> +#else
> +extern char __vvar_page;
> +
> +#define VVAR_ADDRESS (&__vvar_page)
> +#endif
> +
> #define DECLARE_VVAR(offset, type, name) \
> static type const * const vvaraddr_ ## name = \
> (void *)(VVAR_ADDRESS + (offset));
>
> +#define VVAR(name) (*vvaraddr_ ## name)
> +#endif
> +
> #define DEFINE_VVAR(type, name) \
> type name \
> __attribute__((section(".vvar_" #name), aligned(16))) __visible
>
> -#define VVAR(name) (*vvaraddr_ ## name)
> -
> #endif
>
> /* DECLARE_VVAR(offset, type, name) */
> --
> 1.8.5.3
>



--
Andy Lutomirski
AMA Capital Management, LLC


\
 
 \ /
  Last update: 2014-02-04 20:01    [W:0.069 / U:0.872 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site