The patch titled
hrtimer: correct a few numbers in comments, fix printk output
has been removed from the -mm tree. Its filename was
hrtimer-correct-a-few-numbers-in-comments.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hrtimer: correct a few numbers in comments, fix printk output
From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
- fix comments
- remove incorrect left-shift in printk output
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Luming Yu <luming.yu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/time/tick-oneshot.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN kernel/time/tick-oneshot.c~hrtimer-correct-a-few-numbers-in-comments kernel/time/tick-oneshot.c
--- a/kernel/time/tick-oneshot.c~hrtimer-correct-a-few-numbers-in-comments
+++ a/kernel/time/tick-oneshot.c
@@ -39,7 +39,7 @@ int tick_dev_program_event(struct clock_
/*
* 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_
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;
}
_
Patches currently in -mm which might be from u.kleine-koenig@xxxxxxxxxxxxxx are
rtc-mc13783-fix-use-after-free-bug.patch
linux-next.patch
timer-print-function-name-for-timer-callbacks-modifying-preemption-count.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
