git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
nmi.c
diff --git
a/arch/i386/kernel/nmi.c
b/arch/i386/kernel/nmi.c
index
d43b498
..
be87c5e
100644
(file)
--- a/
arch/i386/kernel/nmi.c
+++ b/
arch/i386/kernel/nmi.c
@@
-138,12
+138,12
@@
static int __init check_nmi_watchdog(void)
if (nmi_watchdog == NMI_LOCAL_APIC)
smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
if (nmi_watchdog == NMI_LOCAL_APIC)
smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
- for_each_
possible_
cpu(cpu)
+ for_each_cpu(cpu)
prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
local_irq_enable();
mdelay((10*1000)/nmi_hz); // wait 10 ticks
prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
local_irq_enable();
mdelay((10*1000)/nmi_hz); // wait 10 ticks
- for
_each_possible_cpu(cpu
) {
+ for
(cpu = 0; cpu < NR_CPUS; cpu++
) {
#ifdef CONFIG_SMP
/* Check cpu_callin_map here because that is set
after the timer is started. */
#ifdef CONFIG_SMP
/* Check cpu_callin_map here because that is set
after the timer is started. */
@@
-510,7
+510,7
@@
void touch_nmi_watchdog (void)
* Just reset the alert counters, (other CPUs might be
* spinning on locks we hold):
*/
* Just reset the alert counters, (other CPUs might be
* spinning on locks we hold):
*/
- for
_each_possible_cpu(i
)
+ for
(i = 0; i < NR_CPUS; i++
)
alert_counter[i] = 0;
/*
alert_counter[i] = 0;
/*
@@
-529,8
+529,7
@@
void nmi_watchdog_tick (struct pt_regs * regs)
* always switch the stack NMI-atomically, it's safe to use
* smp_processor_id().
*/
* always switch the stack NMI-atomically, it's safe to use
* smp_processor_id().
*/
- unsigned int sum;
- int cpu = smp_processor_id();
+ int sum, cpu = smp_processor_id();
sum = per_cpu(irq_stat, cpu).apic_timer_irqs;
sum = per_cpu(irq_stat, cpu).apic_timer_irqs;
@@
-544,7
+543,7
@@
void nmi_watchdog_tick (struct pt_regs * regs)
/*
* die_nmi will return ONLY if NOTIFY_STOP happens..
*/
/*
* die_nmi will return ONLY if NOTIFY_STOP happens..
*/
- die_nmi(regs, "
BUG:
NMI Watchdog detected LOCKUP");
+ die_nmi(regs, "NMI Watchdog detected LOCKUP");
} else {
last_irq_sums[cpu] = sum;
alert_counter[cpu] = 0;
} else {
last_irq_sums[cpu] = sum;
alert_counter[cpu] = 0;