diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-29 09:03:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-29 09:03:25 -0700 |
| commit | 810fb07a9b504ac22b95899cf8b39d25a5f3e5c5 (patch) | |
| tree | 9dc8cf4ef4b9795b82c4b5204f80475da482ccc5 /include/uapi/linux | |
| parent | 7d9e55feae5543b16ec9d433079c9db455929a67 (diff) | |
| parent | a3ed0e4393d6885b4af7ce84b437dc696490a530 (diff) | |
| download | linux-810fb07a9b504ac22b95899cf8b39d25a5f3e5c5.tar.gz linux-810fb07a9b504ac22b95899cf8b39d25a5f3e5c5.tar.bz2 linux-810fb07a9b504ac22b95899cf8b39d25a5f3e5c5.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Two fixes from the timer departement:
- Fix a long standing issue in the NOHZ tick code which causes RB
tree corruption, delayed timers and other malfunctions. The cause
for this is code which modifies the expiry time of an enqueued
hrtimer.
- Revert the CLOCK_MONOTONIC/CLOCK_BOOTTIME unification due to
regression reports. Seems userspace _is_ relying on the documented
behaviour despite our hope that it wont"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert: Unify CLOCK_MONOTONIC and CLOCK_BOOTTIME
tick/sched: Do not mess with an enqueued hrtimer
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/time.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h index 16a296612ba4..4c0338ea308a 100644 --- a/include/uapi/linux/time.h +++ b/include/uapi/linux/time.h @@ -73,7 +73,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) |