diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:38 +0800 |
| commit | 59e35359ec360b74e9013ccab84c19ce53db38f9 (patch) | |
| tree | f6c5cca3189d2140f23e7a71ee3f167c7e6f748e /arch/x86/entry/vsyscall/vsyscall_64.c | |
| parent | c210bc406de6a7993b8d7f30c28436be80de7694 (diff) | |
| parent | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-18.02-android
Diffstat (limited to 'arch/x86/entry/vsyscall/vsyscall_64.c')
| -rw-r--r-- | arch/x86/entry/vsyscall/vsyscall_64.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 112178b401a1..2d359991a273 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -46,6 +46,7 @@ static enum { EMULATE, NATIVE, NONE } vsyscall_mode = #else EMULATE; #endif +unsigned long vsyscall_pgprot = __PAGE_KERNEL_VSYSCALL; static int __init vsyscall_setup(char *str) { @@ -336,11 +337,11 @@ void __init map_vsyscall(void) extern char __vsyscall_page; unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page); + if (vsyscall_mode != NATIVE) + vsyscall_pgprot = __PAGE_KERNEL_VVAR; if (vsyscall_mode != NONE) __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, - vsyscall_mode == NATIVE - ? PAGE_KERNEL_VSYSCALL - : PAGE_KERNEL_VVAR); + __pgprot(vsyscall_pgprot)); BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) != (unsigned long)VSYSCALL_ADDR); |