← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-lts-wily/trusty-security

« back to all changes in this revision

Viewing changes to kernel/time/tick-sched.c

  • Committer: Package Import Robot
  • Author(s): Kamal Mostafa, Kamal Mostafa
  • Date: 2016-02-25 17:47:15 UTC
  • Revision ID: package-import@ubuntu.com-20160225174715-k7zfimvf5qx3bgd9
Tags: 4.2.0-32.37~14.04.1
https://launchpad.net/bugs/1550463
[ Kamal Mostafa ]

* Release Tracking Bug
  - LP: #1550463

[ Kamal Mostafa ]

* Merged back Ubuntu-4.2.0-31.36

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/time/tick-sched.c
988
988
        /* Get the next period */
989
989
        next = tick_init_jiffy_update();
990
990
 
 
991
        hrtimer_set_expires(&ts->sched_timer, next);
991
992
        hrtimer_forward_now(&ts->sched_timer, tick_period);
992
 
        hrtimer_set_expires(&ts->sched_timer, next);
993
 
        tick_program_event(next, 1);
 
993
        tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
994
994
        tick_nohz_activate(ts, NOHZ_MODE_LOWRES);
995
995
}
996
996