From 460a2f8519a52db11be27d9ac62933558394e0e0 Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Wed, 30 Jan 2008 13:30:01 +0100
Subject: [PATCH] --- yaml --- r: 79691 b: refs/heads/master c:
 1d76c2622813fbc692b0d323028cfef9ee36051a h: refs/heads/master i:   79689:
 224977153298c50327b2c3cd0ed6a3714d2a16b8   79687:
 b6ef6898f44b17fe000e19b9fc7038d5663f82fe v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/clocksource.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3a8ce04a2a55..c82a4df2e86e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 186e3cb8a465bac010ee3b020768d2fa2b505aef
+refs/heads/master: 1d76c2622813fbc692b0d323028cfef9ee36051a
diff --git a/trunk/include/linux/clocksource.h b/trunk/include/linux/clocksource.h
index 107787aacb64..07b42153de24 100644
--- a/trunk/include/linux/clocksource.h
+++ b/trunk/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