From 66ff7b13415a44734055d72a7fbb8bde40e7d4e6 Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Wed, 17 Oct 2007 18:04:34 +0200
Subject: [PATCH] --- yaml --- r: 70960 b: refs/heads/master c:
 27eb0b288fb3b46350f3e6c2fad0b36937a4cc85 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/mm/pgtable_32.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 54a7e87d61d2..b70377b1aa3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 509a80c49c512ac88bd67b981145f925a306111b
+refs/heads/master: 27eb0b288fb3b46350f3e6c2fad0b36937a4cc85
diff --git a/trunk/arch/x86/mm/pgtable_32.c b/trunk/arch/x86/mm/pgtable_32.c
index bbaa2b153934..be61a1d845a4 100644
--- a/trunk/arch/x86/mm/pgtable_32.c
+++ b/trunk/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))