Messages in this thread Patch in this message | | | Date | Thu, 01 Jan 1970 03:00:02 +0300 | From | Cyrill Gorcunov <> | Subject | [patch 2/2] x86: apic unification - merge down enable_NMI_through_LVT0 |
| |
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> ---
No code change on binary level.
Index: linux-2.6.git/arch/x86/kernel/apic_32.c =================================================================== --- linux-2.6.git.orig/arch/x86/kernel/apic_32.c 2008-07-24 14:16:55.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/apic_32.c 2008-07-24 14:22:00.000000000 +0400 @@ -205,11 +205,15 @@ EXPORT_SYMBOL_GPL(apic_ops); */ void __cpuinit enable_NMI_through_LVT0(void) { - unsigned int v = APIC_DM_NMI; + unsigned int v; + + /* unmask and set to NMI */ + v = APIC_DM_NMI; - /* Level triggered for 82489DX */ + /* Level triggered for 82489DX (32bit mode) */ if (!lapic_is_integrated()) v |= APIC_LVT_LEVEL_TRIGGER; + apic_write(APIC_LVT0, v); } Index: linux-2.6.git/arch/x86/kernel/apic_64.c =================================================================== --- linux-2.6.git.orig/arch/x86/kernel/apic_64.c 2008-07-24 14:16:55.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/apic_64.c 2008-07-24 14:22:09.000000000 +0400 @@ -220,6 +220,11 @@ void __cpuinit enable_NMI_through_LVT0(v /* 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); } --
| |