diff options
| author | Linus Torvalds | 2018-04-22 10:49:02 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-22 10:49:02 -0700 |
| commit | c1e9dae0a9bf3394818abafaf376a34248c5f638 (patch) | |
| tree | ea08f0f3abf819c5796db600c2c0a18028525293 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/timekeeping32.h | 3 | ||||
| -rw-r--r-- | include/linux/timer.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h index af4114d5dc17..3616b4becb59 100644 --- a/include/linux/timekeeping32.h +++ b/include/linux/timekeeping32.h @@ -9,9 +9,6 @@ extern void do_gettimeofday(struct timeval *tv); unsigned long get_seconds(void); -/* does not take xtime_lock */ -struct timespec __current_kernel_time(void); - static inline struct timespec current_kernel_time(void) { struct timespec64 now = current_kernel_time64(); diff --git a/include/linux/timer.h b/include/linux/timer.h index 2448f9cc48a3..7b066fd38248 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -8,8 +8,6 @@ #include <linux/debugobjects.h> #include <linux/stringify.h> -struct tvec_base; - struct timer_list { /* * All fields that change during normal runtime grouped to the |