diff options
| author | Don Zickus <dzickus@redhat.com> | 2006-09-26 08:52:27 (GMT) |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 08:52:27 (GMT) |
| commit | 2fbe7b25c8edaf2d10e6c1a4cc9f8afe714c4764 (patch) | |
| tree | e4012ae3cd4519cba1836668237f077c60fb1086 /include/asm-i386 | |
| parent | 957dc87c1bd849440f0eef27e2ade67387001e13 (diff) | |
| download | linux-fsl-qoriq-2fbe7b25c8edaf2d10e6c1a4cc9f8afe714c4764.tar.xz | |
[PATCH] i386/x86-64: Remove un/set_nmi_callback and reserve/release_lapic_nmi functions
Removes the un/set_nmi_callback and reserve/release_lapic_nmi functions as
they are no longer needed. The various subsystems are modified to register
with the die_notifier instead.
Also includes compile fixes by Andrew Morton.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/nmi.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/include/asm-i386/nmi.h b/include/asm-i386/nmi.h index da0e0b4..34d6bf0 100644 --- a/include/asm-i386/nmi.h +++ b/include/asm-i386/nmi.h @@ -6,24 +6,13 @@ #include <linux/pm.h> -struct pt_regs; - -typedef int (*nmi_callback_t)(struct pt_regs * regs, int cpu); - -/** - * set_nmi_callback - * - * Set a handler for an NMI. Only one handler may be - * set. Return 1 if the NMI was handled. - */ -void set_nmi_callback(nmi_callback_t callback); - /** - * unset_nmi_callback + * do_nmi_callback * - * Remove the handler previously set. + * Check to see if a callback exists and execute it. Return 1 + * if the handler exists and was handled successfully. */ -void unset_nmi_callback(void); +int do_nmi_callback(struct pt_regs *regs, int cpu); extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); extern int avail_to_resrv_perfctr_nmi(unsigned int); @@ -33,8 +22,6 @@ extern int reserve_evntsel_nmi(unsigned int); extern void release_evntsel_nmi(unsigned int); extern void setup_apic_nmi_watchdog (void *); -extern int reserve_lapic_nmi(void); -extern void release_lapic_nmi(void); extern void disable_timer_nmi_watchdog(void); extern void enable_timer_nmi_watchdog(void); extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason); |