This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / i386 / kernel / smp.c

diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index 2772f18..c88dcbe 100644 (file)
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -19,7 +19,6 @@
 #include <linux/mc146818rtc.h>
 #include <linux/cache.h>
 #include <linux/interrupt.h>
-#include <linux/dump.h>
 
 #include <asm/mtrr.h>
 #include <asm/tlbflush.h>
@@ -144,13 +143,6 @@ inline void __send_IPI_shortcut(unsigned int shortcut, int vector)
         */
        cfg = __prepare_ICR(shortcut, vector);
 
-       if (vector == DUMP_VECTOR) {
-               /*
-                * Setup DUMP IPI to be delivered as an NMI
-                */
-               cfg = (cfg&~APIC_VECTOR_MASK)|APIC_DM_NMI;
-       }
-
        /*
         * Send the IPI. The write to APIC_ICR fires this off.
         */
@@ -228,13 +220,7 @@ inline void send_IPI_mask_sequence(cpumask_t mask, int vector)
                         * program the ICR 
                         */
                        cfg = __prepare_ICR(0, vector);
-               
-                       if (vector == DUMP_VECTOR) {
-                               /*
-                                * Setup DUMP IPI to be delivered as an NMI
-                                */
-                               cfg = (cfg&~APIC_VECTOR_MASK)|APIC_DM_NMI;
-                       }       
+                       
                        /*
                         * Send the IPI. The write to APIC_ICR fires this off.
                         */
@@ -470,11 +456,6 @@ void flush_tlb_all(void)
        on_each_cpu(do_flush_tlb_all, NULL, 1, 1);
 }
 
-void dump_send_ipi(void)
-{
-       send_IPI_allbutself(DUMP_VECTOR);
-}
-
 /*
  * this function sends a 'reschedule' IPI to another CPU.
  * it goes straight through and wastes no time serializing
@@ -561,7 +542,7 @@ int smp_call_function (void (*func) (void *info), void *info, int nonatomic,
        return 0;
 }
 
-void stop_this_cpu (void * dummy)
+static void stop_this_cpu (void * dummy)
 {
        /*
         * Remove this CPU:
@@ -587,8 +568,6 @@ void smp_send_stop(void)
        local_irq_enable();
 }
 
-EXPORT_SYMBOL(smp_send_stop);
-
 /*
  * Reschedule call back. Nothing to do,
  * all the work is done automatically when
@@ -624,3 +603,4 @@ asmlinkage void smp_call_function_interrupt(void)
                atomic_inc(&call_data->finished);
        }
 }
+