Commit 09d9673d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimers: Fix time comparison
  ptp: Fix clock_getres() implementation
parents fb38f9b8 c9c024b3
...@@ -101,7 +101,9 @@ static s32 scaled_ppm_to_ppb(long ppm) ...@@ -101,7 +101,9 @@ static s32 scaled_ppm_to_ppb(long ppm)
static int ptp_clock_getres(struct posix_clock *pc, struct timespec *tp) 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) static int ptp_clock_settime(struct posix_clock *pc, const struct timespec *tp)
......
...@@ -195,7 +195,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer) ...@@ -195,7 +195,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
struct alarm *alarm; struct alarm *alarm;
ktime_t expired = next->expires; ktime_t expired = next->expires;
if (expired.tv64 >= now.tv64) if (expired.tv64 > now.tv64)
break; break;
alarm = container_of(next, struct alarm, node); alarm = container_of(next, struct alarm, node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment