Merge commit 'v3.7-rc1' into stable/for-linus-3.7
[pandora-kernel.git] / arch / x86 / include / asm / vdso.h
1 #ifndef _ASM_X86_VDSO_H
2 #define _ASM_X86_VDSO_H
3
4 #if defined CONFIG_X86_32 || defined CONFIG_COMPAT
5 extern const char VDSO32_PRELINK[];
6
7 /*
8  * Given a pointer to the vDSO image, find the pointer to VDSO32_name
9  * as that symbol is defined in the vDSO sources or linker script.
10  */
11 #define VDSO32_SYMBOL(base, name)                                       \
12 ({                                                                      \
13         extern const char VDSO32_##name[];                              \
14         (void __user *)(VDSO32_##name - VDSO32_PRELINK +                \
15                         (unsigned long)(base));                         \
16 })
17 #endif
18
19 /*
20  * These symbols are defined with the addresses in the vsyscall page.
21  * See vsyscall-sigreturn.S.
22  */
23 extern void __user __kernel_sigreturn;
24 extern void __user __kernel_rt_sigreturn;
25
26 /*
27  * These symbols are defined by vdso32.S to mark the bounds
28  * of the ELF DSO images included therein.
29  */
30 extern const char vdso32_int80_start, vdso32_int80_end;
31 extern const char vdso32_syscall_start, vdso32_syscall_end;
32 extern const char vdso32_sysenter_start, vdso32_sysenter_end;
33
34 #endif /* _ASM_X86_VDSO_H */