diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-13 14:38:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-13 14:38:22 -0700 |
| commit | f6eb0fed6a3957c0b93e3a00c1ffaad84d4ffc31 (patch) | |
| tree | 9728d3ce3dfee85b12648f5665ca76c07b763623 /include/linux | |
| parent | Merge tag 'x86-urgent-2022-08-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | posix-cpu-timers: Cleanup CPU timers before freeing them during exec (diff) | |
| download | linux-dev-f6eb0fed6a3957c0b93e3a00c1ffaad84d4ffc31.tar.xz linux-dev-f6eb0fed6a3957c0b93e3a00c1ffaad84d4ffc31.zip | |
Merge tag 'timers-urgent-2022-08-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Misc timer fixes:
- fix a potential use-after-free bug in posix timers
- correct a prototype
- address a build warning"
* tag 'timers-urgent-2022-08-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
posix-cpu-timers: Cleanup CPU timers before freeing them during exec
time: Correct the prototype of ns_to_kernel_old_timeval and ns_to_timespec64
posix-timers: Make do_clock_gettime() static
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/time64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/time64.h b/include/linux/time64.h index 2fb8232cff1d..f1bcea8c124a 100644 --- a/include/linux/time64.h +++ b/include/linux/time64.h @@ -145,7 +145,7 @@ static inline s64 timespec64_to_ns(const struct timespec64 *ts) * * Returns the timespec64 representation of the nsec parameter. */ -extern struct timespec64 ns_to_timespec64(const s64 nsec); +extern struct timespec64 ns_to_timespec64(s64 nsec); /** * timespec64_add_ns - Adds nanoseconds to a timespec64 |