diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-09 17:50:11 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-09 17:50:11 +0000 |
| commit | 24edf4b8989a60f108982ee44590df856a8fc9b2 (patch) | |
| tree | a89eadc9e53a8000808cd3b56183a860fb7c51d4 /xen/arch/x86/nmi.c | |
| parent | 09e259436510fe39c0e55a4195f5368a1a386dba (diff) | |
| download | xen-24edf4b8989a60f108982ee44590df856a8fc9b2.tar.gz xen-24edf4b8989a60f108982ee44590df856a8fc9b2.tar.bz2 xen-24edf4b8989a60f108982ee44590df856a8fc9b2.zip | |
bitkeeper revision 1.1389.10.1 (427fa2d3ZV92f_ErvLuIzWbV1f67QA)
Phase 1 of upgrading platform code to be derived from Linux 2.6.11
rather than 2.4.x.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/nmi.c')
| -rw-r--r-- | xen/arch/x86/nmi.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index ee798f9a36..afdf8051bb 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -86,24 +86,20 @@ extern int logical_proc_id[]; int __init check_nmi_watchdog (void) { unsigned int prev_nmi_count[NR_CPUS]; - int j, cpu; + int cpu; if ( !nmi_watchdog ) return 0; printk("Testing NMI watchdog --- "); - for ( j = 0; j < smp_num_cpus; j++ ) - { - cpu = cpu_logical_map(j); + for ( cpu = 0; cpu < smp_num_cpus; cpu++ ) prev_nmi_count[cpu] = nmi_count(cpu); - } __sti(); mdelay((10*1000)/nmi_hz); /* wait 10 ticks */ - for ( j = 0; j < smp_num_cpus; j++ ) + for ( cpu = 0; cpu < smp_num_cpus; cpu++ ) { - cpu = cpu_logical_map(j); if ( nmi_count(cpu) - prev_nmi_count[cpu] <= 5 ) printk("CPU#%d stuck. ", cpu); else |