From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752257AbbJLS5h (ORCPT ); Mon, 12 Oct 2015 14:57:37 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:50112 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752218AbbJLS5f (ORCPT ); Mon, 12 Oct 2015 14:57:35 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Robert Jarzmik , Haojian Zhuang , Eric Miao , Daniel Mack , linux-kernel@vger.kernel.org Subject: Re: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Date: Mon, 12 Oct 2015 20:57:06 +0200 Message-ID: <5992670.d3bXgqJ1o4@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <874mhw6mj1.fsf@belgarion.home> References: <5287252.pkh9x0t1Y6@wuerfel> <11408970.yetkS1BjHr@wuerfel> <874mhw6mj1.fsf@belgarion.home> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:FlJ2rFD6GFfnMGGAbup7DWiRjsgvfXVhoMu/rMk/sieQsc189FH 73skHDEQV54BZDjhyQ7Hp0wJX91T+e86Sjxc4R7GVSYGETxmhI1ihGSszOgt9fRF0SvRjJg J/BS4FOSHhpuWWba7UrPBD5EuhHq75fpse5+dxaA3mUGYe5wYqUBJP9QlcpAFPH9gCHdt1V V79Ux3nE5GW6u0Je9jt8Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:iqQvPzyVeeI=:ubtaQ3D6n9XBi/Z/yuU60s A+VFSzaHdDp+1hzZugOVvKP3e/BV4yLlaf9g8Kt44NogdM3ilqyzkxhQ5Ts39KDSPiVZNmpyL UiR74MSoyxW1ZO5+N8LIBUMAgpyfCP/i1x92ivPu2UIDfSTDnuE0o4cGod2Cu66ZVRxJYNQHR K1OfC0Oh25kSTewijblWl0Y88glV5bSgW9apcqo/hPk7/5sPxpH0tY9e1G0zwl60XmIA5KQ/P rJRMSUOB3fIK76dGyWvOXGRGYmQ758vXafT+4fNjBnOONI+FArdzwmc+dZS5A6JOLTWkVLbLZ imZb6UHhUhuTLG7RM8KheAu26Cd87AA6bM1UyCn8O722JLMYRwKrM1y9RIVRIbMxJBgXAAkvp tiggmPdMSzKawQrt0RKNsZowylg0FltM6FHnmDZQUD4VDrzL7Ey4rsDb4T9Pmd9M8mO1CUe+u SDYPxOLeYtwl5zLSmb9+GtzsedYaCk3diQVkPpC+ide3y6xsAmrJn1jr0YMkJiEyQEDtPyRJf BVGzKe2T36TC6kuwDDqlsilxXE+V1b9RztqKQwvT3FHuC38hxy+8ZRsg+3WniHdbgwOLwsGoI 5+osgXsV0pPzchAWmvcA23sqQ+hmjTf+kyaLVBx0+r4TMvjOYE2zL8c6PHhNH9U+a//GR7QJD 3zXh4YpnbWAtdThJTxV6Xd4apTj7r+5pAhWrOujqtBl1XN6CFOUGU7XDCdio0KqjfTcdRpznE FvC+wV/3n6Yz3HMi Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 12 October 2015 19:10:10 Robert Jarzmik wrote: > Arnd Bergmann 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 > > 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 : > http://www.spinics.net/lists/arm-kernel/msg449414.html > > 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. Arnd