diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
| commit | f7901365aa48b20b25f8402e0fd1eea4ac6c55e7 (patch) | |
| tree | 4cab2d6b92324c06a457c43a5c8bac55581cdfb5 /arch/x86/include/asm/vsyscall.h | |
| parent | cd1fe2006b62234455a91e428bad45331dc79250 (diff) | |
| parent | 701115b70ba8e8b20c6cfe689db4c1dd6af3ece9 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rt
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'arch/x86/include/asm/vsyscall.h')
| -rw-r--r-- | arch/x86/include/asm/vsyscall.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index 4865e10dbb55..9ee85066f407 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -13,6 +13,7 @@ extern void map_vsyscall(void); */ extern bool emulate_vsyscall(struct pt_regs *regs, unsigned long address); extern bool vsyscall_enabled(void); +extern unsigned long vsyscall_pgprot; #else static inline void map_vsyscall(void) {} static inline bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) |