summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2022-08-19 10:30:01 +0800
committerLinus Torvalds <torvalds@linux-foundation.org>2022-08-19 08:17:43 -0700
commit88e0a74902f894fbbc55ad3ad2cb23b4bfba555c (patch)
tree81c7a355de9d07c80fefad2e1392120fcbc65e45 /arch
parent4c2d0b039c5cc0112206a5b22431b577cb1c57ad (diff)
downloadlinux-stable-88e0a74902f894fbbc55ad3ad2cb23b4bfba555c.tar.gz
linux-stable-88e0a74902f894fbbc55ad3ad2cb23b4bfba555c.tar.bz2
linux-stable-88e0a74902f894fbbc55ad3ad2cb23b4bfba555c.zip
x86/mm: Use proper mask when setting PUD mapping
Commit c164fbb40c43f("x86/mm: thread pgprot_t through init_memory_mapping()") mistakenly used __pgprot() which doesn't respect __default_kernel_pte_mask when setting PUD mapping. Fix it by only setting the one bit we actually need (PSE) and leaving the other bits (that have been properly masked) alone. Fixes: c164fbb40c43 ("x86/mm: thread pgprot_t through init_memory_mapping()") Signed-off-by: Aaron Lu <aaron.lu@intel.com> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/init_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 39c5246964a9..0fe690ebc269 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -645,7 +645,7 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
pages++;
spin_lock(&init_mm.page_table_lock);
- prot = __pgprot(pgprot_val(prot) | __PAGE_KERNEL_LARGE);
+ prot = __pgprot(pgprot_val(prot) | _PAGE_PSE);
set_pte_init((pte_t *)pud,
pfn_pte((paddr & PUD_MASK) >> PAGE_SHIFT,