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

Commit 19662027 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ingo Molnar
Browse files

x86: APIC/UP: Remove redundant NMI watchdog downgrade 



For the UP case the NMI watchdog downgrade is done consistently in
APIC_init_uniprocessor() now.  Remove redundant code used only when
BIOS-disabled local APIC is activated.

Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent acae7d90

arch/x86/kernel/apic_32.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1154,9 +1154,6 @@ static int __init detect_init_APIC(void) 
	if (l & MSR_IA32_APICBASE_ENABLE)

	if (l & MSR_IA32_APICBASE_ENABLE)

		mp_lapic_addr = l & MSR_IA32_APICBASE_BASE;

		mp_lapic_addr = l & MSR_IA32_APICBASE_BASE;





	if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)

		nmi_watchdog = NMI_LOCAL_APIC;



	printk(KERN_INFO "Found and enabled local APIC!\n");

	printk(KERN_INFO "Found and enabled local APIC!\n");





	apic_pm_activate();

	apic_pm_activate();