From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932919AbdDRXa5 (ORCPT ); Tue, 18 Apr 2017 19:30:57 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34763 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758218AbdDRXay (ORCPT ); Tue, 18 Apr 2017 19:30:54 -0400 From: Matthias Kaehlcke To: John Stultz , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, Dmitry Torokhov , Grant Grundler , Greg Hackmann , Michael Davidson , Matthias Kaehlcke Subject: [PATCH v2] clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK Date: Tue, 18 Apr 2017 16:30:37 -0700 Message-Id: <20170418233037.70990-1-mka@chromium.org> X-Mailer: git-send-email 2.12.2.816.g2cccc81164-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Matthias Kaehlcke --- Changes in v2: - Remove unnecessary cast to u64 include/linux/clocksource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index cfc75848a35d..f2b10d9ebd04 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -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) { -- 2.12.2.816.g2cccc81164-goog