linux-kernel - [PATCH] hrtimer: correct a few numbers in comments and printk outputs

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: <1259228499-3927-1-git-send-email-u.kleine-koenig@pengutronix.de>
Date:	Thu, 26 Nov 2009 10:41:39 +0100
From:	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
To:	linux-kernel@...r.kernel.org
Cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Luming Yu <luming.yu@...il.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH] hrtimer: correct a few numbers in comments and printk outputs

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Luming Yu <luming.yu@...il.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
---
Hello,

I rebased this onto next/master now.

Best regards
Uwe

 kernel/hrtimer.c           |    4 ++--
 kernel/time/tick-oneshot.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index ede5277..fd89917 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1220,7 +1220,7 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now)
 static int force_clock_reprogram;
 
 /*
- * After 5 iteration's attempts, we consider that hrtimer_interrupt()
+ * After 4 iteration's attempts, we consider that hrtimer_interrupt()
  * is hanging, which could happen with something that slows the interrupt
  * such as the tracing. Then we force the clock reprogramming for each future
  * hrtimer interrupts to avoid infinite loops and use the min_delta_ns
@@ -1258,7 +1258,7 @@ void hrtimer_interrupt(struct clock_event_device *dev)
 	dev->next_event.tv64 = KTIME_MAX;
 
  retry:
-	/* 5 retries is enough to notice a hang */
+	/* 4 retries is enough to notice a hang */
 	if (!(++nr_retries % 5))
 		hrtimer_interrupt_hanging(dev, ktime_sub(ktime_get(), now));
 
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c
index 0a8a213..6c12fe0 100644
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
@@ -39,7 +39,7 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
 
 		/*
 		 * We tried 2 times to program the device with the given
-		 * min_delta_ns. If that's not working then we double it
+		 * min_delta_ns. If that's not working then we increase it
 		 * and emit a warning.
 		 */
 		if (++i > 2) {
@@ -52,7 +52,7 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
 			printk(KERN_WARNING
 			       "CE: %s increasing min_delta_ns to %llu nsec\n",
 			       dev->name ? dev->name : "?",
-			       (unsigned long long) dev->min_delta_ns << 1);
+			       (unsigned long long) dev->min_delta_ns);
 
 			i = 0;
 		}
-- 
1.6.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/