]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[WATCHDOG] hpwdt: Fix kdump when using hpwdt
authorBernhard Walle <bwalle@suse.de>
Sun, 26 Oct 2008 14:59:37 +0000 (15:59 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 1 Dec 2008 15:55:10 +0000 (15:55 +0000)
When the "hpwdt" module is loaded (even if the /dev/watchdog device is not
opened), then kdump does not work. The panic kernel either does not start at
all or crash in various places.

The problem is that hpwdt_pretimeout is registered with register_die_notifier()
with the highest possible priority. Because it returns NOTIFY_STOP, the
crash_nmi_callback which is also registered with register_die_notifier()
is never executed. This causes the shutdown of other CPUs to fail.

Reverting the order is no option: The crash_nmi_callback executes HLT
and so never returns normally. Because of that, it must be executed as
last notifier, which currently is done.

So, that patch returns NOTIFY_OK to keep the crash_nmi_callback executed.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
drivers/watchdog/hpwdt.c

index f6cff7b5a547fd0815e065ff500dc2ce13f2dfcd..763c1ea5dce54b38ce2a1da262e0a8f39a2688a3 100644 (file)
@@ -485,7 +485,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
                        "Management Log for details.\n");
        }
 
-       return NOTIFY_STOP;
+       return NOTIFY_OK;
 }
 
 /*