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

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

drivers/ptp/ptp_clock.c

+3 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);