From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752497AbbJLNqh (ORCPT ); Mon, 12 Oct 2015 09:46:37 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:59571 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbbJLNqg (ORCPT ); Mon, 12 Oct 2015 09:46:36 -0400 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Daniel Mack , Haojian Zhuang , linux-kernel@vger.kernel.org, Eric Miao Subject: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Date: Mon, 12 Oct 2015 15:46:08 +0200 Message-ID: <11408970.yetkS1BjHr@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <5287252.pkh9x0t1Y6@wuerfel> References: <5287252.pkh9x0t1Y6@wuerfel> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:Ac9xwwh/xBfOdGwgJMCvKGlE65Twk57edV2zkEkxJHwdJ3BKnVk f4sQYm3GJQUZMZTWyQZoZwEFIleGfJWonmPqXSXX6oIConv8/SZj0EssNMPJ12rIUZbaYdr I8iJRcumYD1Y+fM+kvIiJQSor1Xc2ddN5kKORyIc8EoD2gWsshQTa91fHeBQEsCThlPBU/t SxDyFYMXLIWSgLpE9IA8w== X-UI-Out-Filterresults: notjunk:1;V01:K0:AZUTpB1I6Oc=:aew2Aut1v3GwCzRtH58XLW WQuEQ99IPkc8DFQv5PbzSDd/U2OTaj41987pm+k8pVhDHDlsklELtlkBypp0SLlg1UVrHYs2d 4tGnMI2jJeAeFPqT8b2Yl+WczuECGoX2VwfHK+UP9jl+pi/7TinoNzrBQYJnAmqh0AXF9hGrJ GohuR+igCifDEhmWVdc3x9DoQtAR7Rg8kcBva8Oig/oY8JZFYxGfpLcxxlsFgJ8H9svO+/awU btMtXvEmW7fNe5YlI4Bu/AYW1fO/9hTZ0DTqJO1IaDeAGQHZ4QAuGwa6yD4nerAgyAtXB/YaD D+Rtjq0DQHDYREjlg3QC+X/4lNmODg1Gfk7QgWcLgiqRYbDrZ2KIIZEMoNx/eSA8brcaD1e9t TIj1qKj8t8rnrDYvtwAbtKAMMfQywkoTYSWlPzcKUk8zFm9BMbjSN2xCfB8+eKtv6foW3WBPk Z9b3bMep6VG0Xw+IUhxsTkT2h0mlJ5asGBDbdSm5VOMM1z6mjexVnhWpr9DxXthj3xoX+Up+E VkSuwUoBQNKzeLAd4MQ9G3xczLK3hCwcgRGibkhl3NyKI9FfTWLg/xuo5BzhKpWAqmMjGlVdk e8Nt+So9mcQA/H2RH0D9bC8134OJDMZBVLDHot0NTX0jyafBdOWw9gwEBabhx4E1evLDAPsdW iOYMYBLZXlcotsgDPcYkMN/es7mYNk96FK2b1v0Wcdz1RkLSfYnWRJl1p+lcvhNtVti5LYYoT 81Y7Tj/Vg6CdMnhp Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The z2 machine calls pxa27x_set_pwrmode() in order to power off the machine, but this function gets discarded early at boot because it is marked __init, as pointed out by kbuild: WARNING: vmlinux.o(.text+0x145c4): Section mismatch in reference from the function z2_power_off() to the function .init.text:pxa27x_set_pwrmode() The function z2_power_off() references the function __init pxa27x_set_pwrmode(). This is often because z2_power_off lacks a __init annotation or the annotation of pxa27x_set_pwrmode is wrong. This removes the __init section modifier to fix rebooting and the build error. Signed-off-by: Arnd Bergmann Fixes: ba4a90a6d86a ("ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available") --- This is a fix for an old bug, I'd just put it into 4.4 It showed up now because section mismatches now produce errors instead of warnings. diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 885d83cfa522..3d5335f2bbe0 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(pxa27x_configure_ac97reset); */ static unsigned int pwrmode = PWRMODE_SLEEP; -int __init pxa27x_set_pwrmode(unsigned int mode) +int pxa27x_set_pwrmode(unsigned int mode) { switch (mode) { case PWRMODE_SLEEP: diff --git a/arch/arm/mach-pxa/pxa27x.h b/arch/arm/mach-pxa/pxa27x.h index d064e0a9f2ce..075131d83eab 100644 --- a/arch/arm/mach-pxa/pxa27x.h +++ b/arch/arm/mach-pxa/pxa27x.h @@ -19,7 +19,7 @@ #define ARB_CORE_PARK (1<<24) /* Be parked with core when idle */ #define ARB_LOCK_FLAG (1<<23) /* Only Locking masters gain access to the bus */ -extern int __init pxa27x_set_pwrmode(unsigned int mode); +extern int pxa27x_set_pwrmode(unsigned int mode); extern void pxa27x_cpu_pm_enter(suspend_state_t state); #endif /* __MACH_PXA27x_H */