linux-kernel - [tip: core/core] Revert "timekeeping: Use time_after() in timekeeping_check

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <172510414774.2215.15979645843783952294.tip-bot2@tip-bot2>
Date: Sat, 31 Aug 2024 11:35:47 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: core/core] Revert "timekeeping: Use time_after() in
 timekeeping_check_update()"

The following commit has been merged into the core/core branch of tip:

Commit-ID:     908c1217c074b83222cdb88235bd940e51463244
Gitweb:        https://git.kernel.org/tip/908c1217c074b83222cdb88235bd940e51463244
Author:        Thomas Gleixner <tglx@...utronix.de>
AuthorDate:    Sat, 31 Aug 2024 13:26:26 +02:00
Committer:     Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Sat, 31 Aug 2024 13:26:26 +02:00

Revert "timekeeping: Use time_after() in timekeeping_check_update()"

This reverts commit 42db2c2cb5ac3572380a9489b8f8bbe0e534dfc7.

Due to build warnings.

Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 kernel/time/timekeeping.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6cda65d..5391e41 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -217,7 +217,7 @@ static void timekeeping_check_update(struct timekeeper *tk, u64 offset)
 	}
 
 	if (tk->underflow_seen) {
-		if (time_after(jiffies, tk->last_warning + WARNING_FREQ)) {
+		if (jiffies - tk->last_warning > WARNING_FREQ) {
 			printk_deferred("WARNING: Underflow in clocksource '%s' observed, time update ignored.\n", name);
 			printk_deferred("         Please report this, consider using a different clocksource, if possible.\n");
 			printk_deferred("         Your kernel is probably still fine.\n");
@@ -227,7 +227,7 @@ static void timekeeping_check_update(struct timekeeper *tk, u64 offset)
 	}
 
 	if (tk->overflow_seen) {
-		if (time_after(jiffies, tk->last_warning + WARNING_FREQ)) {
+		if (jiffies - tk->last_warning > WARNING_FREQ) {
 			printk_deferred("WARNING: Overflow in clocksource '%s' observed, time update capped.\n", name);
 			printk_deferred("         Please report this, consider using a different clocksource, if possible.\n");
 			printk_deferred("         Your kernel is probably still fine.\n");