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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* '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

Linus Torvalds 14 years ago 09d9673d fb38f9b8

+4 -2

2 changed files

expand all

drivers

ptp

ptp_clock.c

kernel

time

alarmtimer.c

+3 -1

drivers/ptp/ptp_clock.c

··· 101 101 102 102 static int ptp_clock_getres(struct posix_clock *pc, struct timespec *tp) 103 103 { 104 - return 1; /* always round timer functions to one nanosecond */ 104 + tp->tv_sec = 0; 105 + tp->tv_nsec = 1; 106 + return 0; 105 107 } 106 108 107 109 static int ptp_clock_settime(struct posix_clock *pc, const struct timespec *tp)

+1 -1

kernel/time/alarmtimer.c

··· 195 195 struct alarm *alarm; 196 196 ktime_t expired = next->expires; 197 197 198 - if (expired.tv64 >= now.tv64) 198 + if (expired.tv64 > now.tv64) 199 199 break; 200 200 201 201 alarm = container_of(next, struct alarm, node);