I am not sure why we need the wrap_{max|min}() in kernel/sched/clock.c.
But I checked the implementation of max() and min() in linux/kernel.h, I think
we can reuse them here rather than introduce a new function named
wrap_{max|min}().Signed-off-by: Dongsheng Yang <[email protected]> --- kernel/sched/clock.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index 3ef6451..36c03a8 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -173,20 +173,6 @@ void sched_clock_init(void) } /* - * min, max except they take wrapping into account - */ - -static inline u64 wrap_min(u64 x, u64 y) -{ - return (s64)(x - y) < 0 ? x : y; -} - -static inline u64 wrap_max(u64 x, u64 y) -{ - return (s64)(x - y) > 0 ? x : y; -} - -/* * update the percpu scd from the raw @now value * * - filter out backward motion @@ -212,11 +198,11 @@ again: */ clock = scd->tick_gtod + delta; - min_clock = wrap_max(scd->tick_gtod, old_clock); - max_clock = wrap_max(old_clock, scd->tick_gtod + TICK_NSEC); + min_clock = max(scd->tick_gtod, old_clock); + max_clock = max(old_clock, scd->tick_gtod + TICK_NSEC); - clock = wrap_max(clock, min_clock); - clock = wrap_min(clock, max_clock); + clock = max(clock, min_clock); + clock = min(clock, max_clock); if (cmpxchg64(&scd->clock, old_clock, clock) != old_clock) goto again; -- 1.8.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
