timer fixes for 3.2
Subsystems (3)
Linus,
please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
Thanks,
tglx
------------------>
Thomas Gleixner (2):
ptp: Fix clock_getres() implementation
alarmtimers: Fix time comparison
drivers/ptp/ptp_clock.c | 4 +++- kernel/time/alarmtimer.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/ptp/ptp_clock.c +3 -1
@@ -101,7 +101,9 @@ static s32 scaled_ppm_to_ppb(long ppm)static int ptp_clock_getres (struct posix_clock *pc,struct timespec *tp) { -return 1 ;/* always round timer functions to one nanosecond */ + tp->tv_sec =0 ; + tp->tv_nsec =1 ; +return 0 ; }static int ptp_clock_settime (struct posix_clock *pc,const struct timespec *tp)
kernel/time/alarmtimer.c +1 -1
@@ -195,7 +195,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)struct alarm *alarm;ktime_t expired = next->expires; -if (expired.tv64 >= now.tv64) +if (expired.tv64 > now.tv64)break ; alarm = container_of(next, struct alarm, node);