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@xxxxxxxxxxxxx>
AuthorDate: Sat, 31 Aug 2024 13:26:26 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
---
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");
|