Commit dc4304f7deee29fcdf6a2b62f7146ea7f505fd42
1 parent
030aebd2e4
rangetimers: fix the bug reported by Ingo for real
and please hand me a brown paper bag (thanks to Thomas for pointing out this very obvious bug) Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff
kernel/hrtimer.c
| ... | ... | @@ -1395,15 +1395,11 @@ |
| 1395 | 1395 | unsigned long flags; |
| 1396 | 1396 | struct tick_device *td; |
| 1397 | 1397 | struct clock_event_device *dev; |
| 1398 | - struct hrtimer_cpu_base *cpu_base; | |
| 1399 | - if (hrtimer_hres_active()) | |
| 1398 | + | |
| 1399 | + if (!hrtimer_hres_active()) | |
| 1400 | 1400 | return; |
| 1401 | 1401 | |
| 1402 | 1402 | local_irq_save(flags); |
| 1403 | - cpu_base = &__get_cpu_var(hrtimer_bases); | |
| 1404 | - if (!cpu_base->hres_active) | |
| 1405 | - goto out; | |
| 1406 | - | |
| 1407 | 1403 | td = &__get_cpu_var(tick_cpu_device); |
| 1408 | 1404 | if (!td) |
| 1409 | 1405 | goto out; |