[tip:timers/core] Revert "ktime: Simplify ktime_compare implementation"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  9902747ec57d11b27c98e53d66112ecceed43c82
Gitweb:     http://git.kernel.org/tip/9902747ec57d11b27c98e53d66112ecceed43c82
Author:     Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Mon, 26 Jun 2017 10:24:27 +0200
Committer:  Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Mon, 26 Jun 2017 10:39:40 +0200

Revert "ktime: Simplify ktime_compare implementation"

Thierry bisected boot failures to this simplification commit.

Reverts: 3f1d472055bb ("ktime: Simplify ktime_compare implementation")
Reported-by: Thierry Reding <thierry.reding@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Mariusz Skamra <mariuszx.skamra@xxxxxxxxx>
---
 include/linux/ktime.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 04817b1..0c8bd45 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -108,7 +108,11 @@ static inline ktime_t timeval_to_ktime(struct timeval tv)
  */
 static inline int ktime_compare(const ktime_t cmp1, const ktime_t cmp2)
 {
-	return ktime_sub(cmp1, cmp2);
+	if (cmp1 < cmp2)
+		return -1;
+	if (cmp1 > cmp2)
+		return 1;
+	return 0;
 }
 
 /**
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux