aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/io_apic_32.c12
-rw-r--r--arch/x86/kernel/nmi_32.c9
2 files changed, 17 insertions, 4 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index 742fab45e1c6..8ed6eb967652 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -2124,10 +2124,14 @@ static inline void __init check_timer(void)
2124{ 2124{
2125 int apic1, pin1, apic2, pin2; 2125 int apic1, pin1, apic2, pin2;
2126 int vector; 2126 int vector;
2127 unsigned int ver;
2127 unsigned long flags; 2128 unsigned long flags;
2128 2129
2129 local_irq_save(flags); 2130 local_irq_save(flags);
2130 2131
2132 ver = apic_read(APIC_LVR);
2133 ver = GET_APIC_VERSION(ver);
2134
2131 /* 2135 /*
2132 * get/set the timer IRQ vector: 2136 * get/set the timer IRQ vector:
2133 */ 2137 */
@@ -2140,11 +2144,15 @@ static inline void __init check_timer(void)
2140 * mode for the 8259A whenever interrupts are routed 2144 * mode for the 8259A whenever interrupts are routed
2141 * through I/O APICs. Also IRQ0 has to be enabled in 2145 * through I/O APICs. Also IRQ0 has to be enabled in
2142 * the 8259A which implies the virtual wire has to be 2146 * the 8259A which implies the virtual wire has to be
2143 * disabled in the local APIC. 2147 * disabled in the local APIC. Finally timer interrupts
2148 * need to be acknowledged manually in the 8259A for
2149 * timer_interrupt() and for the i82489DX when using
2150 * the NMI watchdog.
2144 */ 2151 */
2145 apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); 2152 apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);
2146 init_8259A(1); 2153 init_8259A(1);
2147 timer_ack = 1; 2154 timer_ack = !cpu_has_tsc;
2155 timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver));
2148 if (timer_over_8254 > 0) 2156 if (timer_over_8254 > 0)
2149 enable_8259A_irq(0); 2157 enable_8259A_irq(0);
2150 2158
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index 662e63e1cd57..8421d0ac6f22 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -26,6 +26,7 @@
26 26
27#include <asm/smp.h> 27#include <asm/smp.h>
28#include <asm/nmi.h> 28#include <asm/nmi.h>
29#include <asm/timer.h>
29 30
30#include "mach_traps.h" 31#include "mach_traps.h"
31 32
@@ -81,7 +82,7 @@ int __init check_nmi_watchdog(void)
81 82
82 prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); 83 prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL);
83 if (!prev_nmi_count) 84 if (!prev_nmi_count)
84 return -1; 85 goto error;
85 86
86 printk(KERN_INFO "Testing NMI watchdog ... "); 87 printk(KERN_INFO "Testing NMI watchdog ... ");
87 88
@@ -118,7 +119,7 @@ int __init check_nmi_watchdog(void)
118 if (!atomic_read(&nmi_active)) { 119 if (!atomic_read(&nmi_active)) {
119 kfree(prev_nmi_count); 120 kfree(prev_nmi_count);
120 atomic_set(&nmi_active, -1); 121 atomic_set(&nmi_active, -1);
121 return -1; 122 goto error;
122 } 123 }
123 printk("OK.\n"); 124 printk("OK.\n");
124 125
@@ -129,6 +130,10 @@ int __init check_nmi_watchdog(void)
129 130
130 kfree(prev_nmi_count); 131 kfree(prev_nmi_count);
131 return 0; 132 return 0;
133error:
134 timer_ack = !cpu_has_tsc;
135
136 return -1;
132} 137}
133 138
134static int __init setup_nmi_watchdog(char *str) 139static int __init setup_nmi_watchdog(char *str)