1 files changed, 4 insertions, 2 deletions

diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index ef1f6cd3ea66..be61a1d845a4 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -6,6 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
+#include <linux/nmi.h>
 #include <linux/swap.h>
 #include <linux/smp.h>
 #include <linux/highmem.h>
@@ -39,6 +40,8 @@ void show_mem(void)
         for_each_online_pgdat(pgdat) {
                 pgdat_resize_lock(pgdat, &flags);
                 for (i = 0; i < pgdat->node_spanned_pages; ++i) {
+                        if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
+                                touch_nmi_watchdog();
                         page = pgdat_page_nr(pgdat, i);
                         total++;
                         if (PageHighMem(page))
@@ -97,8 +100,7 @@ static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
         }
         pte = pte_offset_kernel(pmd, vaddr);
         if (pgprot_val(flags))
-                /* <pfn,flags> stored as-is, to permit clearing entries */
-                set_pte(pte, pfn_pte(pfn, flags));
+                set_pte_present(&init_mm, vaddr, pte, pfn_pte(pfn, flags));
         else
                 pte_clear(&init_mm, vaddr, pte);