From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Wed, 30 Jan 2008 12:30:01 +0000 (+0100)
Subject: clocksource: make CLOCKSOURCE_MASK bullet-proof
X-Git-Tag: v2.6.25-rc1~1143^2~884
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d76c2622813fbc692b0d323028cfef9ee36051a;p=thirdparty%2Fkernel%2Flinux.git

clocksource: make CLOCKSOURCE_MASK bullet-proof

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 107787aacb647..07b42153de245 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -103,7 +103,7 @@ struct clocksource {
 #define CLOCK_SOURCE_VALID_FOR_HRES		0x20
 
 /* simplify initialization of mask field */
-#define CLOCKSOURCE_MASK(bits) (cycle_t)(bits<64 ? ((1ULL<<bits)-1) : -1)
+#define CLOCKSOURCE_MASK(bits) (cycle_t)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
 
 /**
  * clocksource_khz2mult - calculates mult from khz and shift