platform/x86: asus-wmi: switch to use <linux/units.h> helpers

[linux-2.6-microblaze.git] / kernel / up.c

diff --git a/kernel/up.c b/kernel/up.c
index 862b460..53144d0 100644 (file)
--- a/kernel/up.c
+++ b/kernel/up.c
@@ -68,9 +68,8 @@ EXPORT_SYMBOL(on_each_cpu_mask);
  * Preemption is disabled here to make sure the cond_func is called under the
  * same condtions in UP and SMP.
  */
-void on_each_cpu_cond_mask(bool (*cond_func)(int cpu, void *info),
-                          smp_call_func_t func, void *info, bool wait,
-                          gfp_t gfp_flags, const struct cpumask *mask)
+void on_each_cpu_cond_mask(smp_cond_func_t cond_func, smp_call_func_t func,
+                          void *info, bool wait, const struct cpumask *mask)
 {
        unsigned long flags;
 
@@ -84,11 +83,10 @@ void on_each_cpu_cond_mask(bool (*cond_func)(int cpu, void *info),
 }
 EXPORT_SYMBOL(on_each_cpu_cond_mask);
 
-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)
+void on_each_cpu_cond(smp_cond_func_t cond_func, smp_call_func_t func,
+                     void *info, bool wait)
 {
-       on_each_cpu_cond_mask(cond_func, func, info, wait, gfp_flags, NULL);
+       on_each_cpu_cond_mask(cond_func, func, info, wait, NULL);
 }
 EXPORT_SYMBOL(on_each_cpu_cond);