Merge branch 'smp/hotplug' into sched/core, to resolve conflicts

[linux-2.6-block.git] / kernel / sched / sched.h

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index d24e91b0a722cc21fcc501383bbec8a4844614ef..ab6adb159e234ab490b630bedab38b8e917979d8 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1700,6 +1700,10 @@ enum rq_nohz_flag_bits {
 };
 
 #define nohz_flags(cpu)        (&cpu_rq(cpu)->nohz_flags)
+
+extern void nohz_balance_exit_idle(unsigned int cpu);
+#else
+static inline void nohz_balance_exit_idle(unsigned int cpu) { }
 #endif
 
 #ifdef CONFIG_IRQ_TIME_ACCOUNTING