The patch titled
i386: stop bogus nmi & softlockup warnings in show_mem
has been added to the -mm tree. Its filename is
i386-stop-bogus-nmi-softlockup-warnings-in-show_mem.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i386: stop bogus nmi & softlockup warnings in show_mem
From: Prarit Bhargava <prarit@xxxxxxxxxx>
When dumping memory via sysrq-m it is possible to take a bogus NMI watchdog
or softlockup watchdog because the dump can take a long time on big memory
systems.
Occasionally tickle the watchdog when doing the dump.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/mm/pgtable.c | 3 +++
1 files changed, 3 insertions(+)
diff -puN arch/i386/mm/pgtable.c~i386-stop-bogus-nmi-softlockup-warnings-in-show_mem arch/i386/mm/pgtable.c
--- a/arch/i386/mm/pgtable.c~i386-stop-bogus-nmi-softlockup-warnings-in-show_mem
+++ a/arch/i386/mm/pgtable.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))
_
Patches currently in -mm which might be from prarit@xxxxxxxxxx are
i386-stop-bogus-nmi-softlockup-warnings-in-show_mem.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
