diff --git a/[refs] b/[refs] index 829e1b309c9a..20175f693214 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3fa8ebc25129bb69929e20b0c84049c39029d8d +refs/heads/master: 05ebb76109f302b949e745724bbf0f0634dba43f diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h index 0cd696cee998..2fa2987c9a07 100644 --- a/trunk/include/linux/time.h +++ b/trunk/include/linux/time.h @@ -28,10 +28,13 @@ struct timezone { #ifdef __KERNEL__ /* Parameters used to convert the timespec values: */ -#define MSEC_PER_SEC 1000L -#define USEC_PER_SEC 1000000L -#define NSEC_PER_SEC 1000000000L -#define NSEC_PER_USEC 1000L +#define MSEC_PER_SEC 1000L +#define USEC_PER_MSEC 1000L +#define NSEC_PER_USEC 1000L +#define NSEC_PER_MSEC 1000000L +#define USEC_PER_SEC 1000000L +#define NSEC_PER_SEC 1000000000L +#define FSEC_PER_SEC 1000000000000000L static inline int timespec_equal(struct timespec *a, struct timespec *b) {