Unified · Split
| @@ -1394,22 +1394,16 @@ void hrtimer_interrupt(struct clock_event_device *dev) · 1393 unmodified lines | |||
| 1394 | */ | 1394 | */ |
| 1395 | void hrtimer_peek_ahead_timers(void) | 1395 | void hrtimer_peek_ahead_timers(void) |
| 1396 | { | 1396 | { |
| 1397 | unsigned long flags; | ||
| 1398 | struct tick_device *td; | 1397 | struct tick_device *td; |
| 1399 | struct clock_event_device *dev; | 1398 | unsigned long flags; |
| 1400 | 1399 | ||
| 1401 | if (!hrtimer_hres_active()) | 1400 | if (!hrtimer_hres_active()) |
| 1402 | return; | 1401 | return; |
| 1403 | 1402 | ||
| 1404 | local_irq_save(flags); | 1403 | local_irq_save(flags); |
| 1405 | td = &__get_cpu_var(tick_cpu_device); | 1404 | td = &__get_cpu_var(tick_cpu_device); |
| 1406 | if (!td) | 1405 | if (td && td->evtdev) |
| 1407 | goto out; | 1406 | hrtimer_interrupt(td->evtdev); |
| 1408 | dev = td->evtdev; | ||
| 1409 | if (!dev) | ||
| 1410 | goto out; | ||
| 1411 | hrtimer_interrupt(dev); | ||
| 1412 | out: | ||
| 1413 | local_irq_restore(flags); | 1407 | local_irq_restore(flags); |
| 1414 | } | 1408 | } |
| 1415 | 1409 | ||