[PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode
arnd at arndb.de
Mon Oct 12 11:57:06 PDT 2015
On Monday 12 October 2015 19:10:10 Robert Jarzmik wrote:
> Arnd Bergmann <arnd at arndb.de> writes:
> > 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 at 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.
> Hi Arnd,
> I already have this queued for 4.4 from Thierry's patch in :
> Yet your patch is more complete, as it deals also with the header in pxa27x.h
> and has the fixes tag.
> Now I'm wondering if I should enhance Thierry's patch with yours and keeping
> your signoff with your permission, or drop Thierry's one to replace by yours (I
> don't know if it's sane behavior to drop an already queued patch ...)
Thierry's patch has no effect unless both the declaration and the use are changed.
Feel free to fix it any way you see fit by rebasing/replacing or adding
the rest of my patch on top.
As long as nobody has picked up your branch into another tree, you can
rebase it, otherwise it has to be done on top. Some people like to never
rebase, others do it all the time and if I see something very wrong in
a branch that I get as a pull request, I will ask for it to be rebased.
More information about the linux-arm-kernel