diff options
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 69dba0c71727..d358d4e3a958 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -191,7 +191,6 @@ u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time) | |||
| 191 | void tick_nohz_stop_sched_tick(void) | 191 | void tick_nohz_stop_sched_tick(void) |
| 192 | { | 192 | { |
| 193 | unsigned long seq, last_jiffies, next_jiffies, delta_jiffies, flags; | 193 | unsigned long seq, last_jiffies, next_jiffies, delta_jiffies, flags; |
| 194 | unsigned long rt_jiffies; | ||
| 195 | struct tick_sched *ts; | 194 | struct tick_sched *ts; |
| 196 | ktime_t last_update, expires, now; | 195 | ktime_t last_update, expires, now; |
| 197 | struct clock_event_device *dev = __get_cpu_var(tick_cpu_device).evtdev; | 196 | struct clock_event_device *dev = __get_cpu_var(tick_cpu_device).evtdev; |
| @@ -243,10 +242,6 @@ void tick_nohz_stop_sched_tick(void) | |||
| 243 | next_jiffies = get_next_timer_interrupt(last_jiffies); | 242 | next_jiffies = get_next_timer_interrupt(last_jiffies); |
| 244 | delta_jiffies = next_jiffies - last_jiffies; | 243 | delta_jiffies = next_jiffies - last_jiffies; |
| 245 | 244 | ||
| 246 | rt_jiffies = rt_needs_cpu(cpu); | ||
| 247 | if (rt_jiffies && rt_jiffies < delta_jiffies) | ||
| 248 | delta_jiffies = rt_jiffies; | ||
| 249 | |||
| 250 | if (rcu_needs_cpu(cpu)) | 245 | if (rcu_needs_cpu(cpu)) |
| 251 | delta_jiffies = 1; | 246 | delta_jiffies = 1; |
| 252 | /* | 247 | /* |
