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

Commit e9427101 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: adjust enable_NMI_through_LVT0() 



Its previous use in a call to on_each_cpu() was pointless, as at the
time that code gets executed only one CPU is online. Further, the
function can be __cpuinit, and for this to work without
CONFIG_HOTPLUG_CPU setup_nmi() must also get an attribute (this one
can even be __init; on 64-bits check_timer() also was lacking that
attribute).

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent cae45957

arch/x86/kernel/apic_32.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ u32 safe_apic_wait_icr_idle(void) 
/**

 * enable_NMI_through_LVT0 - enable NMI through local vector table 0

 */

void enable_NMI_through_LVT0 (void * dummy)

void __cpuinit enable_NMI_through_LVT0(void)

{

	unsigned int v = APIC_DM_NMI;

arch/x86/kernel/apic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ u32 safe_apic_wait_icr_idle(void) 
/**

 * enable_NMI_through_LVT0 - enable NMI through local vector table 0

 */

void enable_NMI_through_LVT0(void *dummy)

void __cpuinit enable_NMI_through_LVT0(void)

{

	unsigned int v;

arch/x86/kernel/io_apic_32.c

+2 −2
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ static struct irq_chip lapic_chip __read_mostly = { 
	.eoi		= ack_apic,

};



static void setup_nmi (void)

static void __init setup_nmi(void)

{

	/*

 	 * Dirty trick to enable the NMI watchdog ...
@@ -2091,7 +2091,7 @@ static void setup_nmi (void) 
	 */ 

	apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ...");



	on_each_cpu(enable_NMI_through_LVT0, NULL, 1, 1);

	enable_NMI_through_LVT0();



	apic_printk(APIC_VERBOSE, " done.\n");

}

arch/x86/kernel/io_apic_64.c

+3 −3
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ static struct hw_interrupt_type lapic_irq_type __read_mostly = { 
	.end = end_lapic_irq,

};



static void setup_nmi (void)

static void __init setup_nmi(void)

{

	/*

 	 * Dirty trick to enable the NMI watchdog ...
@@ -1579,7 +1579,7 @@ static void setup_nmi (void) 
	 */ 

	printk(KERN_INFO "activating NMI Watchdog ...");



	enable_NMI_through_LVT0(NULL);

	enable_NMI_through_LVT0();



	printk(" done.\n");

}
@@ -1655,7 +1655,7 @@ static inline void unlock_ExtINT_logic(void) 
 *

 * FIXME: really need to revamp this for modern platforms only.

 */

static inline void check_timer(void)

static inline void __init check_timer(void)

{

	struct irq_cfg *cfg = irq_cfg + 0;

	int apic1, pin1, apic2, pin2;

arch/x86/kernel/smpboot_32.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static void __cpuinit start_secondary(void *unused) 
	setup_secondary_clock();

	if (nmi_watchdog == NMI_IO_APIC) {

		disable_8259A_irq(0);

		enable_NMI_through_LVT0(NULL);

		enable_NMI_through_LVT0();

		enable_8259A_irq(0);

	}

	/*