Merge branch 'timers/urgent' into timers/core

Pick up urgent fixes to apply dependent cleanup patch
This commit is contained in:
Thomas Gleixner
2018-05-02 16:11:12 +02:00
674 changed files with 8481 additions and 4801 deletions

View File

@@ -80,7 +80,6 @@ struct __kernel_old_timeval {
*/
#define CLOCK_SGI_CYCLE 10
#define CLOCK_TAI 11
#define CLOCK_MONOTONIC_ACTIVE 12
#define MAX_CLOCKS 16
#define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC)