diff options
author | Juergen Gross <jgross@suse.com> | 2018-07-02 12:00:18 +0200 |
---|---|---|
committer | Juergen Gross <jgross@suse.com> | 2018-07-12 11:57:57 +0200 |
commit | e69b5d308da72cbf4e7911c3979f9a46d28532af (patch) | |
tree | e3c7922a3b1b6bbd9263dce4ff3ec5a07554d1f5 /arch | |
parent | eef04c7b3786ff0c9cb1019278b6c6c2ea0ad4ff (diff) | |
download | linux-e69b5d308da72cbf4e7911c3979f9a46d28532af.tar.gz linux-e69b5d308da72cbf4e7911c3979f9a46d28532af.tar.bz2 linux-e69b5d308da72cbf4e7911c3979f9a46d28532af.zip |
xen: remove global bit from __default_kernel_pte_mask for pv guests
When removing the global bit from __supported_pte_mask do the same for
__default_kernel_pte_mask in order to avoid the WARN_ONCE() in
check_pgprot() when setting a kernel pte before having called
init_mem_mapping().
Cc: <stable@vger.kernel.org> # 4.17
Reported-by: Michael Young <m.a.young@durham.ac.uk>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/xen/enlighten_pv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 8d4e2e1ae60b..4816b6f82a9a 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1229,6 +1229,7 @@ asmlinkage __visible void __init xen_start_kernel(void) /* Prevent unwanted bits from being set in PTEs. */ __supported_pte_mask &= ~_PAGE_GLOBAL; + __default_kernel_pte_mask &= ~_PAGE_GLOBAL; /* * Prevent page tables from being allocated in highmem, even |