mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
[PATCH] Normalize timespec for negative values in ns_to_timespec
- In case of a negative nsec value the result of the division must be normalized. - Remove inline from an exported function. Signed-off-by: George Anzinger <george@wildturkeyranch.net> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
034b91a3b6
commit
88fc3897e3
@ -637,15 +637,16 @@ void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec)
|
||||
*
|
||||
* Returns the timespec representation of the nsec parameter.
|
||||
*/
|
||||
inline struct timespec ns_to_timespec(const nsec_t nsec)
|
||||
struct timespec ns_to_timespec(const nsec_t nsec)
|
||||
{
|
||||
struct timespec ts;
|
||||
|
||||
if (nsec)
|
||||
ts.tv_sec = div_long_long_rem_signed(nsec, NSEC_PER_SEC,
|
||||
&ts.tv_nsec);
|
||||
else
|
||||
ts.tv_sec = ts.tv_nsec = 0;
|
||||
if (!nsec)
|
||||
return (struct timespec) {0, 0};
|
||||
|
||||
ts.tv_sec = div_long_long_rem_signed(nsec, NSEC_PER_SEC, &ts.tv_nsec);
|
||||
if (unlikely(nsec < 0))
|
||||
set_normalized_timespec(&ts, ts.tv_sec, ts.tv_nsec);
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user