summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-07-24 13:52:29 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-24 13:52:29 +0200
commitd4c63ec060f3315653c0ae5bc3a7fe2419a2282f (patch)
tree6dad9a1617786172eb142f4cef8baf7a17bed05f /arch/x86/kernel/apic_64.c
parent36a028de785c6e6f15ac84f8b3b087b89137ea26 (diff)
downloadop-kernel-dev-d4c63ec060f3315653c0ae5bc3a7fe2419a2282f.zip
op-kernel-dev-d4c63ec060f3315653c0ae5bc3a7fe2419a2282f.tar.gz
x86: apic unification - merge down enable_NMI_through_LVT0
No code change on binary level. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: macro@linux-mips.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r--arch/x86/kernel/apic_64.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 4fa2a86..7615b4b 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -150,6 +150,11 @@ void __cpuinit enable_NMI_through_LVT0(void)
/* unmask and set to NMI */
v = APIC_DM_NMI;
+
+ /* Level triggered for 82489DX (32bit mode) */
+ if (!lapic_is_integrated())
+ v |= APIC_LVT_LEVEL_TRIGGER;
+
apic_write(APIC_LVT0, v);
}
OpenPOWER on IntegriCloud