aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/vsyscall.h
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@mit.edu>2011-07-13 09:24:09 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-13 11:22:55 -0700
commitc9712944b2a12373cb6ff8059afcfb7e826a6c54 (patch)
tree73b58eddce6f56c32b90b5056032a504f3ae4f00 /arch/x86/include/asm/vsyscall.h
parent5cec93c216db77c45f7ce970d46283bcb1933884 (diff)
x86-64: Improve vsyscall emulation CS and RIP handling
Three fixes here: - Send SIGSEGV if called from compat code or with a funny CS. - Don't BUG on impossible addresses. - Add a missing local_irq_disable. This patch also removes an unused variable. Signed-off-by: Andy Lutomirski <luto@mit.edu> Link: http://lkml.kernel.org/r/6fb2b13ab39b743d1e4f466eef13425854912f7f.1310563276.git.luto@mit.edu Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/vsyscall.h')
-rw-r--r--arch/x86/include/asm/vsyscall.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
index bb710cb0cdc..d55597351f6 100644
--- a/arch/x86/include/asm/vsyscall.h
+++ b/arch/x86/include/asm/vsyscall.h
@@ -31,18 +31,6 @@ extern struct timezone sys_tz;
extern void map_vsyscall(void);
-/* Emulation */
-
-static inline bool is_vsyscall_entry(unsigned long addr)
-{
- return (addr & ~0xC00UL) == VSYSCALL_START;
-}
-
-static inline int vsyscall_entry_nr(unsigned long addr)
-{
- return (addr & 0xC00UL) >> 10;
-}
-
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */