diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-11 12:01:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-11 12:01:16 +0800 |
| commit | 921884d92b8735f14cface97eb53536cd8ac6108 (patch) | |
| tree | 402c2a0c001aa3417cf737ecf3d2a4185facec7b /arch/x86/include/asm/vsyscall.h | |
| parent | 9c95ff4010dad00b22cc2cc32cad952059f59bd7 (diff) | |
| parent | c5ae3a6aa1a3ff20830852ab0cd9b8c2fba56d4c (diff) | |
Merge tag 'v4.4.111' into linux-linaro-lsk-v4.4
This is the 4.4.111 stable release
Diffstat (limited to 'arch/x86/include/asm/vsyscall.h')
| -rw-r--r-- | arch/x86/include/asm/vsyscall.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index 6ba66ee79710..4865e10dbb55 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -12,12 +12,14 @@ extern void map_vsyscall(void); * Returns true if handled. */ extern bool emulate_vsyscall(struct pt_regs *regs, unsigned long address); +extern bool vsyscall_enabled(void); #else static inline void map_vsyscall(void) {} static inline bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) { return false; } +static inline bool vsyscall_enabled(void) { return false; } #endif #endif /* _ASM_X86_VSYSCALL_H */ |