diff --git a/[refs] b/[refs] index 96c0597d400d..8983ba453d8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd36a9aba44e4ddbac011de2cb14a70444487303 +refs/heads/master: f1c91da44728fba24927e44056a56e507c11cf7b diff --git a/trunk/include/linux/ktime.h b/trunk/include/linux/ktime.h index 2b139f66027f..923665958f90 100644 --- a/trunk/include/linux/ktime.h +++ b/trunk/include/linux/ktime.h @@ -279,6 +279,11 @@ static inline s64 ktime_to_us(const ktime_t kt) return (s64) tv.tv_sec * USEC_PER_SEC + tv.tv_usec; } +static inline s64 ktime_us_delta(const ktime_t later, const ktime_t earlier) +{ + return ktime_to_us(ktime_sub(later, earlier)); +} + /* * The resolution of the clocks. The resolution value is returned in * the clock_getres() system call to give application programmers an