From 20bc2320b66c6a1c63c3c22603401850ef4231ae Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 26 Oct 2005 20:26:53 +0400
Subject: [PATCH] --- yaml --- r: 10111 b: refs/heads/master c:
 7a4ed937aa44acdeb8c6ba671509dc7b54b09d3a h: refs/heads/master i:   10109:
 d8ec7443551015dad76229f38be7cd8283635986   10107:
 98a85a05386be2ba0a487266abc4aac30e13889f   10103:
 f927823f25a84006b9a984e721ddf2adbf515aaa   10095:
 f1660aca59bf1083e73a973f0a52b8fd5652c85d   10079:
 727f3db9f69f2b5747935429750767d95a00a86d   10047:
 4b300c3734308345aed210ae0a187514c9202951   9983:
 e1a1c39a8521cf2d5452baee3d51402d5fede8a7 v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/posix-cpu-timers.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0a2c2487f8e6..b859bb498b61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e02fd44056dd8077b49b4bd92c5799a75e89cd65
+refs/heads/master: 7a4ed937aa44acdeb8c6ba671509dc7b54b09d3a
diff --git a/trunk/kernel/posix-cpu-timers.c b/trunk/kernel/posix-cpu-timers.c
index 2f86424fa515..383ba22f0b62 100644
--- a/trunk/kernel/posix-cpu-timers.c
+++ b/trunk/kernel/posix-cpu-timers.c
@@ -91,7 +91,7 @@ static inline union cpu_time_count cpu_time_sub(clockid_t which_clock,
  * Update expiry time from increment, and increase overrun count,
  * given the current clock sample.
  */
-static inline void bump_cpu_timer(struct k_itimer *timer,
+static void bump_cpu_timer(struct k_itimer *timer,
 				  union cpu_time_count now)
 {
 	int i;
@@ -110,7 +110,7 @@ static inline void bump_cpu_timer(struct k_itimer *timer,
 		for (i = 0; incr < delta - incr; i++)
 			incr = incr << 1;
 		for (; i >= 0; incr >>= 1, i--) {
-			if (delta <= incr)
+			if (delta < incr)
 				continue;
 			timer->it.cpu.expires.sched += incr;
 			timer->it_overrun += 1 << i;
@@ -128,7 +128,7 @@ static inline void bump_cpu_timer(struct k_itimer *timer,
 		for (i = 0; cputime_lt(incr, cputime_sub(delta, incr)); i++)
 			     incr = cputime_add(incr, incr);
 		for (; i >= 0; incr = cputime_halve(incr), i--) {
-			if (cputime_le(delta, incr))
+			if (cputime_lt(delta, incr))
 				continue;
 			timer->it.cpu.expires.cpu =
 				cputime_add(timer->it.cpu.expires.cpu, incr);