From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 21 Apr 2013 09:05:47 +0000 (+0200)
Subject: Merge branch 'timers/nohz-posix-timers-v2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v3.10-rc1~89^2~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a166fcf04d848ffa09f0e831805553089f190cf4;p=linux.git

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

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

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

a166fcf04d848ffa09f0e831805553089f190cf4
diff --cc include/linux/tick.h
index 0b6873cbf512,c2dcfb18f65b..d290168335bc
--- a/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