Merge commit 'origin/master'

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c

14 files changed, 40 insertions, 232 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 1530a41fc56d..de88972c5896 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -115,6 +115,7 @@ config PPC
         select HAVE_KRETPROBES
         select HAVE_LMB
         select HAVE_DMA_ATTRS if PPC64
+        select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_OPROFILE
 
 config EARLY_PRINTK
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 631dfd614b21..a168514d8609 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -172,7 +172,7 @@ static void kexec_prepare_cpus(void)
 {
         int my_cpu, i, notified=-1;
 
-        smp_call_function(kexec_smp_down, NULL, 0, /* wait */0);
+        smp_call_function(kexec_smp_down, NULL, /* wait */0);
         my_cpu = get_cpu();
 
         /* check the others cpus are now down (via paca hw cpu id == -1) */
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 2a60bd3e3afa..c680f1bbd387 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -747,7 +747,7 @@ static int rtas_ibm_suspend_me(struct rtas_args *args)
         /* Call function on all CPUs.  One of us will make the
          * rtas call
          */
-        if (on_each_cpu(rtas_percpu_suspend_me, &data, 1, 0))
+        if (on_each_cpu(rtas_percpu_suspend_me, &data, 0))
                 data.error = -EINVAL;
 
         wait_for_completion(&done);
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index ba7989ffaeee..f5ae9fa222ea 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -72,12 +72,8 @@ struct smp_ops_t *smp_ops;
 
 static volatile unsigned int cpu_callin_map[NR_CPUS];
 
-void smp_call_function_interrupt(void);
-
 int smt_enabled_at_boot = 1;
 
-static int ipi_fail_ok;
-
 static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
 
 #ifdef CONFIG_PPC64
@@ -99,12 +95,15 @@ void smp_message_recv(int msg)
 {
         switch(msg) {
         case PPC_MSG_CALL_FUNCTION:
-                smp_call_function_interrupt();
+                generic_smp_call_function_interrupt();
                 break;
         case PPC_MSG_RESCHEDULE:
                 /* XXX Do we have to do this? */
                 set_need_resched();
                 break;
+        case PPC_MSG_CALL_FUNC_SINGLE:
+                generic_smp_call_function_single_interrupt();
+                break;
         case PPC_MSG_DEBUGGER_BREAK:
                 if (crash_ipi_function_ptr) {
                         crash_ipi_function_ptr(get_irq_regs());
@@ -128,6 +127,19 @@ void smp_send_reschedule(int cpu)
                 smp_ops->message_pass(cpu, PPC_MSG_RESCHEDULE);
 }
 
+void arch_send_call_function_single_ipi(int cpu)
+{
+        smp_ops->message_pass(cpu, PPC_MSG_CALL_FUNC_SINGLE);
+}
+
+void arch_send_call_function_ipi(cpumask_t mask)
+{
+        unsigned int cpu;
+
+        for_each_cpu_mask(cpu, mask)
+                smp_ops->message_pass(cpu, PPC_MSG_CALL_FUNCTION);
+}
+
 #ifdef CONFIG_DEBUGGER
 void smp_send_debugger_break(int cpu)
 {
@@ -154,215 +166,9 @@ static void stop_this_cpu(void *dummy)
                 ;
 }
 
-/*
- * Structure and data for smp_call_function(). This is designed to minimise
- * static memory requirements. It also looks cleaner.
- * Stolen from the i386 version.
- */
-static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);
-
-static struct call_data_struct {
-        void (*func) (void *info);
-        void *info;
-        atomic_t started;
-        atomic_t finished;
-        int wait;
-} *call_data;
-
-/* delay of at least 8 seconds */
-#define SMP_CALL_TIMEOUT        8
-
-/*
- * These functions send a 'generic call function' IPI to other online
- * CPUS in the system.
- *
- * [SUMMARY] Run a function on other CPUs.
- * <func> The function to run. This must be fast and non-blocking.
- * <info> An arbitrary pointer to pass to the function.
- * <nonatomic> currently unused.
- * <wait> If true, wait (atomically) until function has completed on other CPUs.
- * [RETURNS] 0 on success, else a negative status code. Does not return until
- * remote CPUs are nearly ready to execute <<func>> or are or have executed.
- * <map> is a cpu map of the cpus to send IPI to.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-static int __smp_call_function_map(void (*func) (void *info), void *info,
-                                   int nonatomic, int wait, cpumask_t map)
-{
-        struct call_data_struct data;
-        int ret = -1, num_cpus;
-        int cpu;
-        u64 timeout;
-
-        if (unlikely(smp_ops == NULL))
-                return ret;
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        /* remove 'self' from the map */
-        if (cpu_isset(smp_processor_id(), map))
-                cpu_clear(smp_processor_id(), map);
-
-        /* sanity check the map, remove any non-online processors. */
-        cpus_and(map, map, cpu_online_map);
-
-        num_cpus = cpus_weight(map);
-        if (!num_cpus)
-                goto done;
-
-        call_data = &data;
-        smp_wmb();
-        /* Send a message to all CPUs in the map */
-        for_each_cpu_mask(cpu, map)
-                smp_ops->message_pass(cpu, PPC_MSG_CALL_FUNCTION);
-
-        timeout = get_tb() + (u64) SMP_CALL_TIMEOUT * tb_ticks_per_sec;
-
-        /* Wait for indication that they have received the message */
-        while (atomic_read(&data.started) != num_cpus) {
-                HMT_low();
-                if (get_tb() >= timeout) {
-                        printk("smp_call_function on cpu %d: other cpus not "
-                                "responding (%d)\n", smp_processor_id(),
-                                atomic_read(&data.started));
-                        if (!ipi_fail_ok)
-                                debugger(NULL);
-                        goto out;
-                }
-        }
-
-        /* optionally wait for the CPUs to complete */
-        if (wait) {
-                while (atomic_read(&data.finished) != num_cpus) {
-                        HMT_low();
-                        if (get_tb() >= timeout) {
-                                printk("smp_call_function on cpu %d: other "
-                                        "cpus not finishing (%d/%d)\n",
-                                        smp_processor_id(),
-                                        atomic_read(&data.finished),
-                                        atomic_read(&data.started));
-                                debugger(NULL);
-                                goto out;
-                        }
-                }
-        }
-
- done:
-        ret = 0;
-
- out:
-        call_data = NULL;
-        HMT_medium();
-        return ret;
-}
-
-static int __smp_call_function(void (*func)(void *info), void *info,
-                               int nonatomic, int wait)
-{
-        int ret;
-        spin_lock(&call_lock);
-        ret =__smp_call_function_map(func, info, nonatomic, wait,
-                                       cpu_online_map);
-        spin_unlock(&call_lock);
-        return ret;
-}
-
-int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
-                        int wait)
-{
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        return __smp_call_function(func, info, nonatomic, wait);
-}
-EXPORT_SYMBOL(smp_call_function);
-
-int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
-                             int nonatomic, int wait)
-{
-        cpumask_t map = CPU_MASK_NONE;
-        int ret = 0;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        if (!cpu_online(cpu))
-                return -EINVAL;
-
-        cpu_set(cpu, map);
-        if (cpu != get_cpu()) {
-                spin_lock(&call_lock);
-                ret = __smp_call_function_map(func, info, nonatomic, wait, map);
-                spin_unlock(&call_lock);
-        } else {
-                local_irq_disable();
-                func(info);
-                local_irq_enable();
-        }
-        put_cpu();
-        return ret;
-}
-EXPORT_SYMBOL(smp_call_function_single);
-
 void smp_send_stop(void)
 {
-        int nolock;
-
-        /* It's OK to fail sending the IPI, since the alternative is to
-         * be stuck forever waiting on the other CPU to take the interrupt.
-         *
-         * It's better to at least continue and go through reboot, since this
-         * function is usually called at panic or reboot time in the first
-         * place.
-         */
-        ipi_fail_ok = 1;
-
-        /* Don't deadlock in case we got called through panic */
-        nolock = !spin_trylock(&call_lock);
-        __smp_call_function_map(stop_this_cpu, NULL, 1, 0, cpu_online_map);
-        if (!nolock)
-                spin_unlock(&call_lock);
-}
-
-void smp_call_function_interrupt(void)
-{
-        void (*func) (void *info);
-        void *info;
-        int wait;
-
-        /* call_data will be NULL if the sender timed out while
-         * waiting on us to receive the call.
-         */
-        if (!call_data)
-                return;
-
-        func = call_data->func;
-        info = call_data->info;
-        wait = call_data->wait;
-
-        if (!wait)
-                smp_mb__before_atomic_inc();
-
-        /*
-         * Notify initiating CPU that I've grabbed the data and am
-         * about to execute the function
-         */
-        atomic_inc(&call_data->started);
-        /*
-         * At this point the info structure may be out of scope unless wait==1
-         */
-        (*func)(info);
-        if (wait) {
-                smp_mb__before_atomic_inc();
-                atomic_inc(&call_data->finished);
-        }
+        smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 struct thread_info *current_set[NR_CPUS];
@@ -592,9 +398,9 @@ int __devinit start_secondary(void *unused)
 
         secondary_cpu_time_init();
 
-        spin_lock(&call_lock);
+        ipi_call_lock();
         cpu_set(cpu, cpu_online_map);
-        spin_unlock(&call_lock);
+        ipi_call_unlock();
 
         local_irq_enable();
 
diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c
index 6a4fb003fa54..071bee3ec749 100644
--- a/arch/powerpc/kernel/stacktrace.c
+++ b/arch/powerpc/kernel/stacktrace.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/stacktrace.h>
+#include <linux/module.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 
diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c
index 368a4934f7ee..c3a56d65c5a9 100644
--- a/arch/powerpc/kernel/tau_6xx.c
+++ b/arch/powerpc/kernel/tau_6xx.c
@@ -192,7 +192,7 @@ static void tau_timeout_smp(unsigned long unused)
 
         /* schedule ourselves to be run again */
         mod_timer(&tau_timer, jiffies + shrink_timer) ;
-        on_each_cpu(tau_timeout, NULL, 1, 0);
+        on_each_cpu(tau_timeout, NULL, 0);
 }
 
 /*
@@ -234,7 +234,7 @@ int __init TAU_init(void)
         tau_timer.expires = jiffies + shrink_timer;
         add_timer(&tau_timer);
 
-        on_each_cpu(TAU_init_smp, NULL, 1, 0);
+        on_each_cpu(TAU_init_smp, NULL, 0);
 
         printk("Thermal assist unit ");
 #ifdef CONFIG_TAU_INT
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index eb938808ddfb..e2ee66b5831d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -322,7 +322,7 @@ void snapshot_timebases(void)
 {
         if (!cpu_has_feature(CPU_FTR_PURR))
                 return;
-        on_each_cpu(snapshot_tb_and_purr, NULL, 0, 1);
+        on_each_cpu(snapshot_tb_and_purr, NULL, 1);
 }
 
 /*
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 583be67ad938..db44e02e045b 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -556,7 +556,7 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
         if (mask.low_slices || mask.high_slices) {
                 slice_convert(mm, mask, psize);
                 if (psize > MMU_PAGE_BASE)
-                        on_each_cpu(slice_flush_segments, mm, 0, 1);
+                        on_each_cpu(slice_flush_segments, mm, 1);
         }
         return addr;
 
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index 509bc560159b..a01b5c608ff9 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -63,7 +63,7 @@ static void pgtable_free_now(pgtable_free_t pgf)
 {
         pte_freelist_forced_free++;
 
-        smp_call_function(pte_free_smp_sync, NULL, 0, 1);
+        smp_call_function(pte_free_smp_sync, NULL, 1);
 
         pgtable_free(pgf);
 }
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 4908dc98f9ca..17807acb05d9 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -65,7 +65,7 @@ static int op_powerpc_setup(void)
 
         /* Configure the registers on all cpus.  If an error occurs on one
          * of the cpus, op_per_cpu_rc will be set to the error */
-        on_each_cpu(op_powerpc_cpu_setup, NULL, 0, 1);
+        on_each_cpu(op_powerpc_cpu_setup, NULL, 1);
 
 out:    if (op_per_cpu_rc) {
                 /* error on setup release the performance counter hardware */
@@ -100,7 +100,7 @@ static int op_powerpc_start(void)
         if (model->global_start)
                 return model->global_start(ctr);
         if (model->start) {
-                on_each_cpu(op_powerpc_cpu_start, NULL, 0, 1);
+                on_each_cpu(op_powerpc_cpu_start, NULL, 1);
                 return op_per_cpu_rc;
         }
         return -EIO; /* No start function is defined for this
@@ -115,7 +115,7 @@ static inline void op_powerpc_cpu_stop(void *dummy)
 static void op_powerpc_stop(void)
 {
         if (model->stop)
-                on_each_cpu(op_powerpc_cpu_stop, NULL, 0, 1);
+                on_each_cpu(op_powerpc_cpu_stop, NULL, 1);
         if (model->global_stop)
                 model->global_stop();
 }
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 5bf7df146022..2d5bb22d6c09 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -218,6 +218,7 @@ void iic_request_IPIs(void)
 {
         iic_request_ipi(PPC_MSG_CALL_FUNCTION, "IPI-call");
         iic_request_ipi(PPC_MSG_RESCHEDULE, "IPI-resched");
+        iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE, "IPI-call-single");
 #ifdef CONFIG_DEBUGGER
         iic_request_ipi(PPC_MSG_DEBUGGER_BREAK, "IPI-debug");
 #endif /* CONFIG_DEBUGGER */
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index f0b12f212363..a0927a3bacb7 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -105,9 +105,10 @@ static void __init ps3_smp_setup_cpu(int cpu)
          * to index needs to be setup.
          */
 
-        BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION  != 0);
-        BUILD_BUG_ON(PPC_MSG_RESCHEDULE     != 1);
-        BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK != 3);
+        BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION    != 0);
+        BUILD_BUG_ON(PPC_MSG_RESCHEDULE       != 1);
+        BUILD_BUG_ON(PPC_MSG_CALL_FUNC_SINGLE != 2);
+        BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK   != 3);
 
         for (i = 0; i < MSG_COUNT; i++) {
                 result = ps3_event_receive_port_setup(cpu, &virqs[i]);
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index ebebc28fe895..0fc830f576f5 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -383,13 +383,11 @@ static irqreturn_t xics_ipi_dispatch(int cpu)
                         mb();
                         smp_message_recv(PPC_MSG_RESCHEDULE);
                 }
-#if 0
-                if (test_and_clear_bit(PPC_MSG_MIGRATE_TASK,
+                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,
                                        &xics_ipi_message[cpu].value)) {
                         mb();
-                        smp_message_recv(PPC_MSG_MIGRATE_TASK);
+                        smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
                 }
-#endif
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
                 if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,
                                        &xics_ipi_message[cpu].value)) {
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 5788a6ab1254..8e3478c995ef 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1496,7 +1496,7 @@ void mpic_request_ipis(void)
         static char *ipi_names[] = {
                 "IPI0 (call function)",
                 "IPI1 (reschedule)",
-                "IPI2 (unused)",
+                "IPI2 (call function single)",
                 "IPI3 (debugger break)",
         };
         BUG_ON(mpic == NULL);