Attachment 216431 Details for Bug 221612 – backport

[patch] backport

d5433b804efa.patch (text/plain), 2.01 KB, created by George Beshers on 2007-10-04 20:30:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George Beshers

Created: 2007-10-04 20:30:32 UTC

Size: 2.01 KB

patch

obsolete

>
># HG changeset patch
># User Prarit Bhargava <prarit@redhat.com>
># Date 1188640221 25200
># Node ID d5433b804efa167fdc3aeba14ba97702dbe6941d
># Parent de441397d63950b0448be6b0bd5027af4ff49fff
>[IA64] Stop bogus NMI & softlockup warnings in ia64 show_mem
>
>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@redhat.com>
>Signed-off-by: Tony Luck <tony.luck@intel.com>
>
>committer: Tony Luck <tony.luck@intel.com>
>
>
>diff -purN linux.d/arch/ia64/mm/contig.c linux.e/arch/ia64/mm/contig.c
>--- linux.d/arch/ia64/mm/contig.c	2007-10-02 14:24:17.000000000 -0400
>+++ linux.e/arch/ia64/mm/contig.c	2007-10-02 14:54:42.000000000 -0400
>@@ -17,6 +17,7 @@
> #include <linux/bootmem.h>
> #include <linux/efi.h>
> #include <linux/mm.h>
>+#include <linux/nmi.h>
> #include <linux/swap.h>
> 
> #include <asm/meminit.h>
>@@ -57,6 +58,8 @@ void show_mem(void)
> 		present = pgdat->node_present_pages;
> 		for(i = 0; i < pgdat->node_spanned_pages; i++) {
> 			struct page *page;
>+			if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
>+				touch_nmi_watchdog();
> 			if (pfn_valid(pgdat->node_start_pfn + i))
> 				page = pfn_to_page(pgdat->node_start_pfn + i);
> 			else {
>diff -purN linux.d/arch/ia64/mm/discontig.c linux.e/arch/ia64/mm/discontig.c
>--- linux.d/arch/ia64/mm/discontig.c	2007-10-02 14:23:48.000000000 -0400
>+++ linux.e/arch/ia64/mm/discontig.c	2007-10-02 14:54:42.000000000 -0400
>@@ -16,6 +16,7 @@
> 
> #include <linux/kernel.h>
> #include <linux/mm.h>
>+#include <linux/nmi.h>
> #include <linux/swap.h>
> #include <linux/bootmem.h>
> #include <linux/acpi.h>
>@@ -561,6 +562,8 @@ void show_mem(void)
> 		present = pgdat->node_present_pages;
> 		for(i = 0; i < pgdat->node_spanned_pages; i++) {
> 			struct page *page;
>+			if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
>+				touch_nmi_watchdog();
> 			if (pfn_valid(pgdat->node_start_pfn + i))
> 				page = pfn_to_page(pgdat->node_start_pfn + i);
> 			else {

Actions: View | Diff

Attachments on bug 221612: 144914 | 216391 | 216401 | 216411 | 216421 | 216431 | 224591 | 224601 | 224611