[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>

1 files changed, 11 insertions, 74 deletions

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index bd96ea4f2942..acd3fdea2a21 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -42,20 +42,6 @@ static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[3]);
  */
 #define NMI_MAX_COUNTER_BITS 66
 
-/*
- * lapic_nmi_owner tracks the ownership of the lapic NMI hardware:
- * - it may be reserved by some other driver, or not
- * - when not reserved by some other driver, it may be used for
- *   the NMI watchdog, or not
- *
- * This is maintained separately from nmi_active because the NMI
- * watchdog may also be driven from the I/O APIC timer.
- */
-static DEFINE_SPINLOCK(lapic_nmi_owner_lock);
-static unsigned int lapic_nmi_owner;
-#define LAPIC_NMI_WATCHDOG      (1<<0)
-#define LAPIC_NMI_RESERVED      (1<<1)
-
 /* nmi_active:
  * >0: the lapic NMI watchdog is active, but can be disabled
  * <0: the lapic NMI watchdog has not been set up, and cannot
@@ -325,33 +311,6 @@ static void enable_lapic_nmi_watchdog(void)
         touch_nmi_watchdog();
 }
 
-int reserve_lapic_nmi(void)
-{
-        unsigned int old_owner;
-
-        spin_lock(&lapic_nmi_owner_lock);
-        old_owner = lapic_nmi_owner;
-        lapic_nmi_owner |= LAPIC_NMI_RESERVED;
-        spin_unlock(&lapic_nmi_owner_lock);
-        if (old_owner & LAPIC_NMI_RESERVED)
-                return -EBUSY;
-        if (old_owner & LAPIC_NMI_WATCHDOG)
-                disable_lapic_nmi_watchdog();
-        return 0;
-}
-
-void release_lapic_nmi(void)
-{
-        unsigned int new_owner;
-
-        spin_lock(&lapic_nmi_owner_lock);
-        new_owner = lapic_nmi_owner & ~LAPIC_NMI_RESERVED;
-        lapic_nmi_owner = new_owner;
-        spin_unlock(&lapic_nmi_owner_lock);
-        if (new_owner & LAPIC_NMI_WATCHDOG)
-                enable_lapic_nmi_watchdog();
-}
-
 void disable_timer_nmi_watchdog(void)
 {
         BUG_ON(nmi_watchdog != NMI_IO_APIC);
@@ -866,6 +825,15 @@ done:
         return rc;
 }
 
+int do_nmi_callback(struct pt_regs * regs, int cpu)
+{
+#ifdef CONFIG_SYSCTL
+        if (unknown_nmi_panic)
+                return unknown_nmi_panic_callback(regs, cpu);
+#endif
+        return 0;
+}
+
 #ifdef CONFIG_SYSCTL
 
 static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu)
@@ -873,37 +841,8 @@ static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu)
         unsigned char reason = get_nmi_reason();
         char buf[64];
 
-        if (!(reason & 0xc0)) {
-                sprintf(buf, "NMI received for unknown reason %02x\n", reason);
-                die_nmi(regs, buf);
-        }
-        return 0;
-}
-
-/*
- * proc handler for /proc/sys/kernel/unknown_nmi_panic
- */
-int proc_unknown_nmi_panic(ctl_table *table, int write, struct file *file,
-                        void __user *buffer, size_t *length, loff_t *ppos)
-{
-        int old_state;
-
-        old_state = unknown_nmi_panic;
-        proc_dointvec(table, write, file, buffer, length, ppos);
-        if (!!old_state == !!unknown_nmi_panic)
-                return 0;
-
-        if (unknown_nmi_panic) {
-                if (reserve_lapic_nmi() < 0) {
-                        unknown_nmi_panic = 0;
-                        return -EBUSY;
-                } else {
-                        set_nmi_callback(unknown_nmi_panic_callback);
-                }
-        } else {
-                release_lapic_nmi();
-                unset_nmi_callback();
-        }
+        sprintf(buf, "NMI received for unknown reason %02x\n", reason);
+        die_nmi(regs, buf);
         return 0;
 }
 
@@ -917,7 +856,5 @@ EXPORT_SYMBOL(reserve_perfctr_nmi);
 EXPORT_SYMBOL(release_perfctr_nmi);
 EXPORT_SYMBOL(reserve_evntsel_nmi);
 EXPORT_SYMBOL(release_evntsel_nmi);
-EXPORT_SYMBOL(reserve_lapic_nmi);
-EXPORT_SYMBOL(release_lapic_nmi);
 EXPORT_SYMBOL(disable_timer_nmi_watchdog);
 EXPORT_SYMBOL(enable_timer_nmi_watchdog);