diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-22 10:49:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-22 10:49:02 -0700 |
| commit | c1e9dae0a9bf3394818abafaf376a34248c5f638 (patch) | |
| tree | ea08f0f3abf819c5796db600c2c0a18028525293 /arch/x86/include/asm/apicdef.h | |
| parent | 38f0b33e6d5bbf7caa23d0abae19bce1e8db5866 (diff) | |
| parent | 7407188489c62a7b5694bc75a6db2b82af94c9a5 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"A small set of timer fixes:
- Evaluate the -ETIME condition correctly in the imx tpm driver
- Fix the evaluation order of a condition in posix cpu timers
- Use pr_cont() in the clockevents code to prevent ugly message
splitting
- Remove __current_kernel_time() which is now unused to prevent that
new users show up.
- Remove a stale forward declaration"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/imx-tpm: Correct -ETIME return condition check
posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated
timekeeping: Remove __current_kernel_time()
timers: Remove stale struct tvec_base forward declaration
clockevents: Fix kernel messages split across multiple lines
Diffstat (limited to 'arch/x86/include/asm/apicdef.h')
0 files changed, 0 insertions, 0 deletions