diff options
| author | David Howells <dhowells@redhat.com> | 2012-12-14 23:37:13 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-12-14 23:37:13 +0100 |
| commit | af170c5061dd78512c469e6e2d211980cdb2c193 (patch) | |
| tree | a3bb86ee66b69f832b6783124cc0482ce8058cd8 /arch/x86/include/asm/vsyscall.h | |
| parent | Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-af170c5061dd78512c469e6e2d211980cdb2c193.tar.xz linux-af170c5061dd78512c469e6e2d211980cdb2c193.zip | |
UAPI: (Scripted) Disintegrate arch/x86/include/asm
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/vsyscall.h')
| -rw-r--r-- | arch/x86/include/asm/vsyscall.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index 80f80955cfd8..2a46ca720afc 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -1,20 +1,8 @@ #ifndef _ASM_X86_VSYSCALL_H #define _ASM_X86_VSYSCALL_H -enum vsyscall_num { - __NR_vgettimeofday, - __NR_vtime, - __NR_vgetcpu, -}; - -#define VSYSCALL_START (-10UL << 20) -#define VSYSCALL_SIZE 1024 -#define VSYSCALL_END (-2UL << 20) -#define VSYSCALL_MAPPED_PAGES 1 -#define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr)) - -#ifdef __KERNEL__ #include <linux/seqlock.h> +#include <uapi/asm/vsyscall.h> #define VGETCPU_RDTSCP 1 #define VGETCPU_LSL 2 @@ -53,6 +41,4 @@ static inline unsigned int __getcpu(void) } #endif /* CONFIG_X86_64 */ -#endif /* __KERNEL__ */ - #endif /* _ASM_X86_VSYSCALL_H */ |