Merge branch 'timers/nohz-posix-timers-v2' of git://git.kernel.org/pub/scm/linux...

Pull posix cpu timers handling on full dynticks from Frederic Weisbecker.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc include/linux/tick.h
index 0b6873cbf5126eb1d1f708ef9d81cfe370fc763d,c2dcfb18f65b824579556d589a9dd9994081fa2c..d290168335bcc2c9ae5f1c513f2a86f3f4e52b78
--- 1/include/linux/tick.h
--- 2/include/linux/tick.h
+++ b/include/linux/tick.h
@@@ -158,11 -158,13 +158,15 @@@ static inline u64 get_cpu_iowait_time_u
  # endif /* !CONFIG_NO_HZ_COMMON */
  
  #ifdef CONFIG_NO_HZ_FULL
 +extern void tick_nohz_init(void);
  extern int tick_nohz_full_cpu(int cpu);
+ extern void tick_nohz_full_kick(void);
+ extern void tick_nohz_full_kick_all(void);
  #else
 +static inline void tick_nohz_init(void) { }
  static inline int tick_nohz_full_cpu(int cpu) { return 0; }
+ static inline void tick_nohz_full_kick(void) { }
+ static inline void tick_nohz_full_kick_all(void) { }
  #endif
  
  

diff --cc kernel/time/Kconfig
Simple merge

diff --cc kernel/time/tick-sched.c
Simple merge