diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
| commit | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (patch) | |
| tree | 4e99ec8bd3ce134bdbafd54a0fc873f11c33e21b /arch/x86/mm/kaiser.c | |
| parent | 293c379504006b5ea8b4e7109ba4ebc3211f9b91 (diff) | |
| parent | 49fe90b853dfb1087d0a734cd7f4af1aa00c8e53 (diff) | |
Merge tag 'v4.4.114' into linux-linaro-lsk-v4.4lsk-v4.4-18.02
This is the 4.4.114 stable release
Diffstat (limited to 'arch/x86/mm/kaiser.c')
| -rw-r--r-- | arch/x86/mm/kaiser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c index 8af98513d36c..2298434f7bdb 100644 --- a/arch/x86/mm/kaiser.c +++ b/arch/x86/mm/kaiser.c @@ -345,7 +345,7 @@ void __init kaiser_init(void) if (vsyscall_enabled()) kaiser_add_user_map_early((void *)VSYSCALL_ADDR, PAGE_SIZE, - __PAGE_KERNEL_VSYSCALL); + vsyscall_pgprot); for_each_possible_cpu(cpu) { void *percpu_vaddr = __per_cpu_user_mapped_start + |