clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK
authorMatthias Kaehlcke <mka@chromium.org>
Tue, 18 Apr 2017 23:30:37 +0000 (16:30 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 20 Apr 2017 12:56:58 +0000 (14:56 +0200)
Besides reusing existing code this removes the special case handling
for 64-bit masks, which causes clang to raise a shift count overflow
warning due to https://bugs.llvm.org//show_bug.cgi?id=10030.

Suggested-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Cc: Grant Grundler <grundler@chromium.org>
Cc: Greg Hackmann <ghackmann@google.com>
Cc: Michael Davidson <md@google.com>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/20170418233037.70990-1-mka@chromium.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/linux/clocksource.h

index cfc75848a35d2c58ed85720fcd344fdc2c6f04ad..f2b10d9ebd04e7d49d032b5cb097e7f2ae630e56 100644 (file)
@@ -120,7 +120,7 @@ struct clocksource {
 #define CLOCK_SOURCE_RESELECT                  0x100
 
 /* simplify initialization of mask field */
-#define CLOCKSOURCE_MASK(bits) (u64)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
+#define CLOCKSOURCE_MASK(bits) GENMASK_ULL((bits) - 1, 0)
 
 static inline u32 clocksource_freq2mult(u32 freq, u32 shift_constant, u64 from)
 {