From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758316AbdLRNmH (ORCPT ); Mon, 18 Dec 2017 08:42:07 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:63000 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750802AbdLRNmD (ORCPT ); Mon, 18 Dec 2017 08:42:03 -0500 From: Arnd Bergmann To: Brian Norris , Gregory Fong , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Russell King Cc: Arnd Bergmann , Alamy Liu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: B15: fix unused label warnings Date: Mon, 18 Dec 2017 14:41:11 +0100 Message-Id: <20171218134126.2913861-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:f4WzuawdkC+W8uu3zGqtnfl+NAaqgiggg37SfrYCdHDlP1ulRgw BRLM9mJcgv/S4/sbjX7QJUBh/ESTQIYSoyYoMjlqSEEeTRSHyTIWDpVOp50luPWk3Jp0YMT KTNdIXbGXNrWZzFvTvNq/iZHyTrg/6cfU5QYGPHcNBusxZfu6Q5rW34KiGRjiWwrUE8SFcZ SLyouEEtVn7GgrKF8HSUQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:XsXBldl6Nyo=:j833WZfuShBnVbkjWfK1WI BorbZngtpqYCkF5zgRNu6JzSi/5pVRayJy122znRnTfRzevRjZIeLO2fMOyoqH30ObVvp/gpS nAJRFNiCj1pQVYTbLNyysBN7Y1VGVb2tjuatEvXXTLIBtZA+20+lhrsCFhIgTeDkGbyB0Wlfd IeSK+vUzbOzVUoXVn0mG5sqUpZ01A6zBbLVA123COHxvUJzoijzxT/4cx2a5mtccCta6IP014 ISmv5F9H2kDyPmCgTk3ff4aAjZGbzVo/rcthQup0oSCQ3nsm1Hey98kaVw7iEk6/LwKoR9tQ6 2SzyTJcTmNdUVn2XJFPnReuiB9nYKXTgXahMbbM0Bz84Ql785Q9ORwX69VfNQAcwKOTlFM1VN tWDCX8ewrlV8RZlSQJuiKwIT72NjzmWRKJWuY1TRkbKOScsEGuQAuUmSWOTvcIPohrY/5MOSB kwHMvRv5E6J2zm359vNpWa83InxzlBWwaMR6QELW4XqLoIsFyMqdBCZPNGHp4QFxZdHH0Kkj1 8EcDkt+BDXAHXjfjTF+S01AizGneiKvVucZyU4H2vJ9aTZO4IMrnVHZ8xso8BFNDNZY+qLj5M BSCeW0i9z3N09GfUVUsNI+j8WMQewEeSCDPr7EAXgN5bkLGHEeiEDhNxgI9QfHk1L+PfIwXjG XGnSlTquR2IlTu0Zfr16WTLhRa9RYh1A0IegdO/1ygAd60PSNQPkeLBBWCEySKWtsIOwLBhi9 dpc6gthjcZZmtwbS/uNxJq21kMsk+mTUDP1B4Q== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new conditionally compiled code leaves some labels and one variable unreferenced when CONFIG_HOTPLUG_CPU and CONFIG_PM_SLEEP are disabled: arch/arm/mm/cache-b15-rac.c: In function 'b15_rac_init': arch/arm/mm/cache-b15-rac.c:353:1: error: label 'out_unmap' defined but not used [-Werror=unused-label] out_unmap: ^~~~~~~~~ arch/arm/mm/cache-b15-rac.c:351:1: error: label 'out_cpu_dead' defined but not used [-Werror=unused-label] out_cpu_dead: ^~~~~~~~~~~~ At top level: arch/arm/mm/cache-b15-rac.c:53:12: error: 'rac_config0_reg' defined but not used [-Werror=unused-variable] This adds more #ifdefs around them. Fixes: 55de88778f4b ("ARM: 8726/1: B15: Add CPU hotplug awareness") Signed-off-by: Arnd Bergmann --- Florian, if this looks good to you, please forward the fix into Russell's patch tracker, otherwise just send a better fix. --- arch/arm/mm/cache-b15-rac.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mm/cache-b15-rac.c b/arch/arm/mm/cache-b15-rac.c index f76988790011..24cb3b7a0501 100644 --- a/arch/arm/mm/cache-b15-rac.c +++ b/arch/arm/mm/cache-b15-rac.c @@ -50,7 +50,10 @@ extern void v7_flush_kern_cache_all(void); static void __iomem *b15_rac_base; static DEFINE_SPINLOCK(rac_lock); + +#if IS_ENABLED(CONFIG_HOTPLUG_CPU) || IS_ENABLED(CONFIG_PM_SLEEP) static u32 rac_config0_reg; +#endif /* Initialization flag to avoid checking for b15_rac_base, and to prevent * multi-platform kernels from crashing here as well. @@ -348,11 +351,13 @@ static int __init b15_rac_init(void) goto out; +#ifdef CONFIG_HOTPLUG_CPU out_cpu_dead: cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CACHE_B15_RAC_DYING); out_unmap: unregister_reboot_notifier(&b15_rac_reboot_nb); iounmap(b15_rac_base); +#endif out: of_node_put(dn); return ret; -- 2.9.0