From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode
Date: Mon, 12 Oct 2015 15:46:08 +0200 [thread overview]
Message-ID: <11408970.yetkS1BjHr@wuerfel> (raw)
In-Reply-To: <5287252.pkh9x0t1Y6@wuerfel>
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 <arnd@arndb.de>
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 */
next prev parent reply other threads:[~2015-10-12 13:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 13:44 [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Arnd Bergmann
2015-10-12 13:46 ` Arnd Bergmann [this message]
2015-10-12 17:10 ` [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Robert Jarzmik
2015-10-12 18:53 ` Robert Jarzmik
2015-10-12 19:20 ` Arnd Bergmann
2015-10-12 21:07 ` Robert Jarzmik
2015-10-13 7:57 ` Arnd Bergmann
2015-10-12 18:57 ` Arnd Bergmann
2015-10-12 17:03 ` [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Robert Jarzmik
2015-10-12 18:57 ` Arnd Bergmann
2015-10-14 15:14 ` Arnd Bergmann
2015-10-14 19:05 ` Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11408970.yetkS1BjHr@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox