lkml.org 
[lkml]   [2014]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] sched/clock: cleanup, remove wrap_{max|min}().
Date
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 <yangds.fnst@cn.fujitsu.com>
---
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


\
 
 \ /
  Last update: 2014-05-07 15:21    [W:0.114 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site