diff options
author | Jan Beulich <jbeulich@novell.com> | 2008-01-30 07:31:24 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:24 -0500 |
commit | e94271017f0933b29362a3c9dea5a6b9d04d98e1 (patch) | |
tree | e3711fd58a2a6f12a6b09087832468776e3c19e3 /arch/x86/kernel/io_apic_32.c | |
parent | cae4595764cb3b08f6517e99bac1e3862854b1a1 (diff) |
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: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/io_apic_32.c')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 76f11c3e3906..0d204237489e 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -2078,7 +2078,7 @@ static struct irq_chip lapic_chip __read_mostly = { | |||
2078 | .eoi = ack_apic, | 2078 | .eoi = ack_apic, |
2079 | }; | 2079 | }; |
2080 | 2080 | ||
2081 | static void setup_nmi (void) | 2081 | static void __init setup_nmi(void) |
2082 | { | 2082 | { |
2083 | /* | 2083 | /* |
2084 | * Dirty trick to enable the NMI watchdog ... | 2084 | * Dirty trick to enable the NMI watchdog ... |
@@ -2091,7 +2091,7 @@ static void setup_nmi (void) | |||
2091 | */ | 2091 | */ |
2092 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); | 2092 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); |
2093 | 2093 | ||
2094 | on_each_cpu(enable_NMI_through_LVT0, NULL, 1, 1); | 2094 | enable_NMI_through_LVT0(); |
2095 | 2095 | ||
2096 | apic_printk(APIC_VERBOSE, " done.\n"); | 2096 | apic_printk(APIC_VERBOSE, " done.\n"); |
2097 | } | 2097 | } |