diff options
| author | Stefani Seibold | 2014-03-17 23:22:07 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2014-03-18 20:52:29 +0100 |
| commit | ef721987aef0cc0abba08c88810f2155f76b0b1f (patch) | |
| tree | d0e0086b61125be1fabac05a61408dc22ea8b7c0 | |
| parent | x86, vdso: Cleanup __vdso_gettimeofday() (diff) | |
| download | kernel-qcow2-linux-ef721987aef0cc0abba08c88810f2155f76b0b1f.tar.gz kernel-qcow2-linux-ef721987aef0cc0abba08c88810f2155f76b0b1f.tar.xz kernel-qcow2-linux-ef721987aef0cc0abba08c88810f2155f76b0b1f.zip | |
x86, vdso: Introduce VVAR marco for vdso32
This patch revamps the vvar.h for introduce the VVAR macro for vdso32.
Reviewed-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Stefani Seibold <stefani@seibold.net>
Link: http://lkml.kernel.org/r/1395094933-14252-8-git-send-email-stefani@seibold.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | arch/x86/include/asm/vvar.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/x86/include/asm/vvar.h b/arch/x86/include/asm/vvar.h index 0a534eac5f56..52c79ffc3161 100644 --- a/arch/x86/include/asm/vvar.h +++ b/arch/x86/include/asm/vvar.h @@ -26,6 +26,15 @@ #else +#ifdef BUILD_VDSO32 + +#define DECLARE_VVAR(offset, type, name) \ + extern type vvar_ ## name __attribute__((visibility("hidden"))); + +#define VVAR(name) (vvar_ ## name) + +#else + extern char __vvar_page; /* Base address of vvars. This is not ABI. */ @@ -39,12 +48,13 @@ extern char __vvar_page; 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) */ |