Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4c63ec0 authored Jul 24, 2008 by Cyrill Gorcunov Committed by Ingo Molnar Jul 24, 2008

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>

parent 36a028de

arch/x86/kernel/apic_32.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -172,11 +172,15 @@ u32 safe_apic_wait_icr_idle(void)
		*/
		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);
		}

arch/x86/kernel/apic_64.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}