diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-13 07:46:24 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-13 07:46:24 +0400 |
| commit | 06e727d2a5d9d889fabad35223ad77205a9bebb9 (patch) | |
| tree | 2a2d4ec9ed95c95f044c8d69e87ab47195a1d2ed /arch/x86/include/asm/vsyscall.h | |
| parent | e68ff9cd15552e46e0f993eace25af0947b1222d (diff) | |
| parent | 3ae36655b97a03fa1decf72f04078ef945647c1a (diff) | |
| download | linux-06e727d2a5d9d889fabad35223ad77205a9bebb9.tar.xz | |
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip
* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip:
x86-64: Rework vsyscall emulation and add vsyscall= parameter
x86-64: Wire up getcpu syscall
x86: Remove unnecessary compile flag tweaks for vsyscall code
x86-64: Add vsyscall:emulate_vsyscall trace event
x86-64: Add user_64bit_mode paravirt op
x86-64, xen: Enable the vvar mapping
x86-64: Work around gold bug 13023
x86-64: Move the "user" vsyscall segment out of the data segment.
x86-64: Pad vDSO to a page boundary
Diffstat (limited to 'arch/x86/include/asm/vsyscall.h')
| -rw-r--r-- | arch/x86/include/asm/vsyscall.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index 60107072c28b..eaea1d31f753 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -27,6 +27,12 @@ extern struct timezone sys_tz; extern void map_vsyscall(void); +/* + * Called on instruction fetch fault in vsyscall page. + * Returns true if handled. + */ +extern bool emulate_vsyscall(struct pt_regs *regs, unsigned long address); + #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ |