1 files changed, 13 insertions, 4 deletions

diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index e848a4811785..089e78c4effd 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -269,7 +269,7 @@ static void mop_up_one_pmd(struct mm_struct *mm, pgd_t *pgdp)
         if (pgd_val(pgd) != 0) {
                 pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
 
-                *pgdp = native_make_pgd(0);
+                pgd_clear(pgdp);
 
                 paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
                 pmd_free(mm, pmd);
@@ -494,7 +494,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma,
         int changed = !pte_same(*ptep, entry);
 
         if (changed && dirty)
-                *ptep = entry;
+                set_pte(ptep, entry);
 
         return changed;
 }
@@ -509,7 +509,7 @@ int pmdp_set_access_flags(struct vm_area_struct *vma,
         VM_BUG_ON(address & ~HPAGE_PMD_MASK);
 
         if (changed && dirty) {
-                *pmdp = entry;
+                set_pmd(pmdp, entry);
                 /*
                  * We had a write-protection fault here and changed the pmd
                  * to to more permissive. No need to flush the TLB for that,
@@ -529,7 +529,7 @@ int pudp_set_access_flags(struct vm_area_struct *vma, unsigned long address,
         VM_BUG_ON(address & ~HPAGE_PUD_MASK);
 
         if (changed && dirty) {
-                *pudp = entry;
+                set_pud(pudp, entry);
                 /*
                  * We had a write-protection fault here and changed the pud
                  * to to more permissive. No need to flush the TLB for that,
@@ -637,6 +637,15 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte)
 {
         unsigned long address = __fix_to_virt(idx);
 
+#ifdef CONFIG_X86_64
+       /*
+        * Ensure that the static initial page tables are covering the
+        * fixmap completely.
+        */
+        BUILD_BUG_ON(__end_of_permanent_fixed_addresses >
+                     (FIXMAP_PMD_NUM * PTRS_PER_PTE));
+#endif
+
         if (idx >= __end_of_fixed_addresses) {
                 BUG();
                 return;