From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S945844AbdDTNQr (ORCPT ); Thu, 20 Apr 2017 09:16:47 -0400 Received: from terminus.zytor.com ([65.50.211.136]:46715 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S945530AbdDTNQo (ORCPT ); Thu, 20 Apr 2017 09:16:44 -0400 Date: Thu, 20 Apr 2017 06:14:28 -0700 From: tip-bot for Arnd Bergmann Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, will.deacon@arm.com, hpa@zytor.com, daniel.lezcano@linaro.org, marc.zyngier@arm.com, mark.rutland@arm.com, arnd@arndb.de, tglx@linutronix.de, christoffer.dall@linaro.org Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, will.deacon@arm.com, daniel.lezcano@linaro.org, mark.rutland@arm.com, marc.zyngier@arm.com, arnd@arndb.de, tglx@linutronix.de, christoffer.dall@linaro.org In-Reply-To: <20170419173737.3846098-1-arnd@arndb.de> References: <20170419173737.3846098-1-arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] arm64/arch_timer: Mark errata handlers as __maybe_unused Git-Commit-ID: eb64522100a1d4adc89bce11b935a30c4401e234 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: eb64522100a1d4adc89bce11b935a30c4401e234 Gitweb: http://git.kernel.org/tip/eb64522100a1d4adc89bce11b935a30c4401e234 Author: Arnd Bergmann AuthorDate: Wed, 19 Apr 2017 19:37:09 +0200 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 14:56:59 +0200 arm64/arch_timer: Mark errata handlers as __maybe_unused In some rare randconfig builds, we end up with two functions being entirely unused: drivers/clocksource/arm_arch_timer.c:342:12: error: 'erratum_set_next_event_tval_phys' defined but not used [-Werror=unused-function] static int erratum_set_next_event_tval_phys(unsigned long evt, drivers/clocksource/arm_arch_timer.c:335:12: error: 'erratum_set_next_event_tval_virt' defined but not used [-Werror=unused-function] static int erratum_set_next_event_tval_virt(unsigned long evt, We could add an #ifdef around them, but we would already have to check for several symbols there and there is a chance this would get more complicated over time, so marking them as __maybe_unused is the simplest way to avoid the harmless warnings. Fixes: 01d3e3ff2608 ("arm64: arch_timer: Rework the set_next_event workarounds") Signed-off-by: Arnd Bergmann Acked-by: Marc Zyngier Acked-by: Daniel Lezcano Cc: Mark Rutland Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: Christoffer Dall Link: http://lkml.kernel.org/r/20170419173737.3846098-1-arnd@arndb.de Signed-off-by: Thomas Gleixner --- drivers/clocksource/arm_arch_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 2208fa4..a1fb918 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -324,14 +324,14 @@ static void erratum_set_next_event_tval_generic(const int access, unsigned long arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk); } -static int erratum_set_next_event_tval_virt(unsigned long evt, +static __maybe_unused int erratum_set_next_event_tval_virt(unsigned long evt, struct clock_event_device *clk) { erratum_set_next_event_tval_generic(ARCH_TIMER_VIRT_ACCESS, evt, clk); return 0; } -static int erratum_set_next_event_tval_phys(unsigned long evt, +static __maybe_unused int erratum_set_next_event_tval_phys(unsigned long evt, struct clock_event_device *clk) { erratum_set_next_event_tval_generic(ARCH_TIMER_PHYS_ACCESS, evt, clk);