diff options
| author | Jan Beulich <jbeulich@novell.com> | 2008-03-11 11:30:25 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-03-24 11:47:11 -0700 |
| commit | 41abba651b51394ae1119ac26bd1dd2e31bc2dc0 (patch) | |
| tree | f140d04423250aa3c05dda5cb932b9aa985d4d47 /include | |
| parent | c9ef5a43530e7dbec05c1dad59356f85516d2c0b (diff) | |
x86: adjust enable_NMI_through_LVT0()
commit e94271017f0933b29362a3c9dea5a6b9d04d98e1
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>
[ tglx@linutronix.de: backport to 2.6.24.3]
Cc: Justin Piszcz <jpiszcz@lucidpixels.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/apic_32.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/io_apic_64.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/apic_32.h b/include/asm-x86/apic_32.h index be158b27d54..04fbe7fdabf 100644 --- a/include/asm-x86/apic_32.h +++ b/include/asm-x86/apic_32.h @@ -109,7 +109,7 @@ extern void setup_boot_APIC_clock (void); extern void setup_secondary_APIC_clock (void); extern int APIC_init_uniprocessor (void); -extern void enable_NMI_through_LVT0 (void * dummy); +extern void enable_NMI_through_LVT0(void); #define ARCH_APICTIMER_STOPS_ON_C3 1 diff --git a/include/asm-x86/io_apic_64.h b/include/asm-x86/io_apic_64.h index e2c13675ee4..1913ad0ae57 100644 --- a/include/asm-x86/io_apic_64.h +++ b/include/asm-x86/io_apic_64.h @@ -129,7 +129,7 @@ extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int); extern int sis_apic_bug; /* dummy */ -void enable_NMI_through_LVT0 (void * dummy); +void enable_NMI_through_LVT0(void); extern spinlock_t i8259A_lock; |