Title: [8215] trunk/arch/blackfin/kernel/nmi.c: Task [#4796], minor change
- Revision
- 8215
- Author
- gyang
- Date
- 2010-01-21 06:11:50 -0500 (Thu, 21 Jan 2010)
Log Message
Task [#4796], minor change
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/nmi.c (8214 => 8215)
--- trunk/arch/blackfin/kernel/nmi.c 2010-01-21 09:27:39 UTC (rev 8214)
+++ trunk/arch/blackfin/kernel/nmi.c 2010-01-21 11:11:50 UTC (rev 8215)
@@ -159,7 +159,7 @@
cpumask_t mask = cpu_online_map;
if (!atomic_read(&nmi_touched[this_cpu]))
- return 1;
+ return 0;
atomic_set(&nmi_touched[this_cpu], 0);
@@ -169,16 +169,16 @@
(unsigned long)(&nmi_touched[cpu]),
(unsigned long)(&nmi_touched[cpu]));
if (!atomic_read(&nmi_touched[cpu]))
- return 1;
+ return 0;
atomic_set(&nmi_touched[cpu], 0);
}
- return 0;
+ return 1;
}
static void nmi_wdt_timer(void *data)
{
- if (!check_nmi_wdt_touched())
+ if (check_nmi_wdt_touched())
nmi_wdt_keepalive();
mod_timer(&ntimer, jiffies + NMI_CHECK_TIMEOUT);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
