diff options
Diffstat (limited to 'arch/x86/include/asm/vdso/vsyscall.h')
| -rw-r--r-- | arch/x86/include/asm/vdso/vsyscall.h | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h index 67fedf1698b5..4aa311a923f2 100644 --- a/arch/x86/include/asm/vdso/vsyscall.h +++ b/arch/x86/include/asm/vdso/vsyscall.h @@ -2,33 +2,21 @@ #ifndef __ASM_VDSO_VSYSCALL_H #define __ASM_VDSO_VSYSCALL_H -#ifndef __ASSEMBLY__ +#define __VDSO_PAGES 6 -#include <linux/timekeeper_internal.h> -#include <vdso/datapage.h> -#include <asm/vgtod.h> -#include <asm/vvar.h> +#define VDSO_NR_VCLOCK_PAGES 2 +#define VDSO_VCLOCK_PAGES_START(_b) ((_b) + (__VDSO_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE) +#define VDSO_PAGE_PVCLOCK_OFFSET 0 +#define VDSO_PAGE_HVCLOCK_OFFSET 1 -/* - * Update the vDSO data page to keep in sync with kernel timekeeping. - */ -static __always_inline -struct vdso_data *__x86_get_k_vdso_data(void) -{ - return _vdso_data; -} -#define __arch_get_k_vdso_data __x86_get_k_vdso_data +#ifndef __ASSEMBLER__ -static __always_inline -struct vdso_rng_data *__x86_get_k_vdso_rng_data(void) -{ - return &_vdso_rng_data; -} -#define __arch_get_k_vdso_rng_data __x86_get_k_vdso_rng_data +#include <vdso/datapage.h> +#include <asm/vgtod.h> /* The asm-generic header needs to be included after the definitions above */ #include <asm-generic/vdso/vsyscall.h> -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_VSYSCALL_H */ |