openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Cyrill Gorcunov 2008-07-24 13:52:29 +02:00 committed by Ingo Molnar
parent 36a028de78
commit d4c63ec060
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/apic_32.c
View File

@ -172,11 +172,15 @@ u32 safe_apic_wait_icr_idle(void)
*/ */
void __cpuinit enable_NMI_through_LVT0(void) void __cpuinit enable_NMI_through_LVT0(void)
{ {
unsigned int v = APIC_DM_NMI; unsigned int v;
/* Level triggered for 82489DX */ /* unmask and set to NMI */
v = APIC_DM_NMI;
/* Level triggered for 82489DX (32bit mode) */
if (!lapic_is_integrated()) if (!lapic_is_integrated())
v |= APIC_LVT_LEVEL_TRIGGER; v |= APIC_LVT_LEVEL_TRIGGER;
apic_write(APIC_LVT0, v); apic_write(APIC_LVT0, v);
} }

5
arch/x86/kernel/apic_64.c
View File

@ -150,6 +150,11 @@ void __cpuinit enable_NMI_through_LVT0(void)
/* unmask and set to NMI */ /* unmask and set to NMI */
v = APIC_DM_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); apic_write(APIC_LVT0, v);
} }