Merge branch 'nohz/printk-v8' into irq/core

[~shefty/rdma-dev.git] / include / linux / tick.h

diff --git a/include/linux/tick.h b/include/linux/tick.h
index 2307dd31b966014d18ca19f5a9e8666389029e87..553272e6af554844fbea920f0c3b08707c52e13a 100644 (file)
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -157,4 +157,10 @@ static inline u64 get_cpu_idle_time_us(int cpu, u64 *unused) { return -1; }
 static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; }
 # endif /* !NO_HZ */
 
 static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; }
 # endif /* !NO_HZ */
 

+# ifdef CONFIG_CPU_IDLE_GOV_MENU
+extern void menu_hrtimer_cancel(void);
+# else
+static inline void menu_hrtimer_cancel(void) {}
+# endif /* CONFIG_CPU_IDLE_GOV_MENU */
+

 #endif
 #endif