Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

[firefly-linux-kernel-4.4.55.git] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 8cc38d3bab0c57a79f68fe53e4915f9393335cba..10530d92c04b05bd56ab269974094ecfd2efbaab 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -101,6 +101,22 @@ static inline void call_function_init(void) { }
  */
 int on_each_cpu(smp_call_func_t func, void *info, int wait);
 
+/*
+ * Call a function on processors specified by mask, which might include
+ * the local one.
+ */
+void on_each_cpu_mask(const struct cpumask *mask, smp_call_func_t func,
+               void *info, bool wait);
+
+/*
+ * Call a function on each processor for which the supplied function
+ * cond_func returns a positive value. This may include the local
+ * processor.
+ */
+void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),
+               smp_call_func_t func, void *info, bool wait,
+               gfp_t gfp_flags);
+
 /*
  * Mark the boot cpu "online" so that it can call console drivers in
  * printk() and can access its per-cpu storage.
@@ -132,6 +148,36 @@ static inline int up_smp_call_function(smp_call_func_t func, void *info)
                local_irq_enable();             \
                0;                              \
        })
+/*
+ * Note we still need to test the mask even for UP
+ * because we actually can get an empty mask from
+ * code that on SMP might call us without the local
+ * CPU in the mask.
+ */
+#define on_each_cpu_mask(mask, func, info, wait) \
+       do {                                            \
+               if (cpumask_test_cpu(0, (mask))) {      \
+                       local_irq_disable();            \
+                       (func)(info);                   \
+                       local_irq_enable();             \
+               }                                       \
+       } while (0)
+/*
+ * Preemption is disabled here to make sure the cond_func is called under the
+ * same condtions in UP and SMP.
+ */
+#define on_each_cpu_cond(cond_func, func, info, wait, gfp_flags)\
+       do {                                                    \
+               void *__info = (info);                          \
+               preempt_disable();                              \
+               if ((cond_func)(0, __info)) {                   \
+                       local_irq_disable();                    \
+                       (func)(__info);                         \
+                       local_irq_enable();                     \
+               }                                               \
+               preempt_enable();                               \
+       } while (0)
+
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()                     1
 #define smp_prepare_boot_cpu()                 do {} while (0)