From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755458AbbLJSlM (ORCPT ); Thu, 10 Dec 2015 13:41:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34135 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755394AbbLJSlH (ORCPT ); Thu, 10 Dec 2015 13:41:07 -0500 Date: Thu, 10 Dec 2015 10:40:55 -0800 From: tip-bot for Linus Walleij Message-ID: Cc: linus.walleij@linaro.org, linux-kernel@vger.kernel.org, alexander.sverdlin@gmail.com, daniel.lezcano@linaro.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, daniel.lezcano@linaro.org, alexander.sverdlin@gmail.com, linus.walleij@linaro.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1449768101-6879-1-git-send-email-linus.walleij@linaro.org> References: <1449768101-6879-1-git-send-email-linus.walleij@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] clocksource: Mmio: remove artificial 32bit limitation Git-Commit-ID: e2bf3e6ecaff79c5479682da2dc7b2035e52c5b8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e2bf3e6ecaff79c5479682da2dc7b2035e52c5b8 Gitweb: http://git.kernel.org/tip/e2bf3e6ecaff79c5479682da2dc7b2035e52c5b8 Author: Linus Walleij AuthorDate: Thu, 10 Dec 2015 18:21:41 +0100 Committer: Thomas Gleixner CommitDate: Thu, 10 Dec 2015 19:37:18 +0100 clocksource: Mmio: remove artificial 32bit limitation The EP93xx is registering a clocksource of 40 bits with clocksource_mmio_init() but this is not working because of this artificial limitation. It works fine to lift the uppe limit to 64 bits, and since cycle_t is u64, it should intuitively have been like that from the beginning. Fixes: 000bc17817bf "ARM: ep93xx: switch to GENERIC_CLOCKEVENTS" Reported-by: Alexander Sverdlin Signed-off-by: Linus Walleij Cc: Daniel Lezcano Link: http://lkml.kernel.org/r/1449768101-6879-1-git-send-email-linus.walleij@linaro.org Signed-off-by: Thomas Gleixner --- drivers/clocksource/mmio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c index 1593ade..c4f7d7a 100644 --- a/drivers/clocksource/mmio.c +++ b/drivers/clocksource/mmio.c @@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem *base, const char *name, { struct clocksource_mmio *cs; - if (bits > 32 || bits < 16) + if (bits > 64 || bits < 16) return -EINVAL; cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);