[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-80d767d770fd9c697e434fd080c2db7b5c60c6dd@git.kernel.org>
Date: Thu, 6 Feb 2014 07:04:16 -0800
From: tip-bot for Mikulas Patocka <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
mikulas@...ax.karlin.mff.cuni.cz, tglx@...utronix.de,
mpatocka@...hat.com
Subject: [tip:timers/urgent] time: Fix overflow when HZ is smaller than 60
Commit-ID: 80d767d770fd9c697e434fd080c2db7b5c60c6dd
Gitweb: http://git.kernel.org/tip/80d767d770fd9c697e434fd080c2db7b5c60c6dd
Author: Mikulas Patocka <mpatocka@...hat.com>
AuthorDate: Fri, 24 Jan 2014 16:41:36 -0500
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 6 Feb 2014 16:01:40 +0100
time: Fix overflow when HZ is smaller than 60
When compiling for the IA-64 ski emulator, HZ is set to 32 because the
emulation is slow and we don't want to waste too many cycles processing
timers. Alpha also has an option to set HZ to 32.
This causes integer underflow in
kernel/time/jiffies.c:
kernel/time/jiffies.c:66:2: warning: large integer implicitly truncated to unsigned type [-Woverflow]
.mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */
^
This patch reduces the JIFFIES_SHIFT value to avoid the overflow.
Signed-off-by: Mikulas Patocka <mikulas@...ax.karlin.mff.cuni.cz>
Link: http://lkml.kernel.org/r/alpine.LRH.2.02.1401241639100.23871@file01.intranet.prod.int.rdu2.redhat.com
Cc: stable@...r.kernel.org
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
kernel/time/jiffies.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 7a925ba..a6a5bf5 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -51,7 +51,13 @@
* HZ shrinks, so values greater than 8 overflow 32bits when
* HZ=100.
*/
+#if HZ < 34
+#define JIFFIES_SHIFT 6
+#elif HZ < 67
+#define JIFFIES_SHIFT 7
+#else
#define JIFFIES_SHIFT 8
+#endif
static cycle_t jiffies_read(struct clocksource *cs)
{
--
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/
Powered by blists - more mailing lists