From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ralf Baechle Subject: Re: [PATCH 00/12] Fix various section mismatches and build errors. Date: Wed, 29 Jun 2011 14:07:11 +0100 Message-ID: <20110629130711.GA15649@linux-mips.org> References: <17dd5038b15d7135791aadbe80464a13c80758d3.1309182742.git.ralf@linux-mips.org> <20110627.221257.1290251511587162468.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <20110627.221257.1290251511587162468.davem@davemloft.net> Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org To: David Miller Cc: akpm@linux-foundation.org, alan@linux.intel.com, bcasavan@sgi.com, airlied@linux.ie, grundler@parisc-linux.org, JBottomley@parallels.com, perex@perex.cz, rpurdie@rpsys.net, klassert@mathematik.tu-chemnitz.de, tj@kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, linux-scsi@vger.kernel.org, linux-serial@vger.kernel.org, netdev@vger.kernel.org List-Id: linux-serial@vger.kernel.org On Mon, Jun 27, 2011 at 10:12:57PM -0700, David Miller wrote: > commit 948252cb9e01d65a89ecadf67be5018351eee15e > Author: David S. Miller > Date: Tue May 31 19:27:48 2011 -0700 >=20 > Revert "net: fix section mismatches" > =20 > This reverts commit e5cb966c0838e4da43a3b0751bdcac7fe719f7b4. > =20 > It causes new build regressions with gcc-4.2 which is > pretty common on non-x86 platforms. > =20 > Reported-by: James Bottomley > Signed-off-by: David S. Miller >=20 > and postings that led to this revert including: >=20 > http://marc.info/?l=3Dlinux-netdev&m=3D130653748205263&w=3D2 Thanks for the pointers; I looked into it a bit deeper and found that t= he construct which hppa64-linux-gcc 4.2.4 doesn't like is the combination = of const and __devinitconst __devinitdata. My patches are minimalistic and don't do any constification and seem to work fine for PA-RISC. A possible alternative to allow the use of Micha=C5=82's reverted patch= would be to conditionalize the definition of __devinitconst. There is no user of __devexitconst so I left that unchanged. Ralf Signed-off-by: Ralf Baechle include/linux/init.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/linux/init.h b/include/linux/init.h index 577671c..e12fd85 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -84,7 +84,15 @@ /* Used for HOTPLUG */ #define __devinit __section(.devinit.text) __cold #define __devinitdata __section(.devinit.data) +#if defined __GNUC__ && (__GNUC__ =3D=3D 4) && (__GNUC_MINOR__ =3D=3D = 2) +/* + * GCC 4.2 will sometimes throw an error if the combination of const a= nd + * __devinitconst is being used. As a workaround make __devinitconst = a noop + */ +#define __devinitconst +#else #define __devinitconst __section(.devinit.rodata) +#endif #define __devexit __section(.devexit.text) __exitused __cold #define __devexitdata __section(.devexit.data) #define __devexitconst __section(.devexit.rodata)