From patchwork Wed Jun 29 13:07:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 102594 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7183AB6F53 for ; Wed, 29 Jun 2011 23:08:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756221Ab1F2NIf (ORCPT ); Wed, 29 Jun 2011 09:08:35 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:55919 "EHLO duck.linux-mips.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755481Ab1F2NId (ORCPT ); Wed, 29 Jun 2011 09:08:33 -0400 Received: from duck.linux-mips.net (duck.linux-mips.net [127.0.0.1]) by duck.linux-mips.net (8.14.4/8.14.3) with ESMTP id p5TD7LWv021276; Wed, 29 Jun 2011 14:07:23 +0100 Received: (from ralf@localhost) by duck.linux-mips.net (8.14.4/8.14.4/Submit) id p5TD7BAE021254; Wed, 29 Jun 2011 14:07:11 +0100 Date: Wed, 29 Jun 2011 14:07:11 +0100 From: Ralf Baechle 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 Subject: Re: [PATCH 00/12] Fix various section mismatches and build errors. 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-Disposition: inline In-Reply-To: <20110627.221257.1290251511587162468.davem@davemloft.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 > > Revert "net: fix section mismatches" > > This reverts commit e5cb966c0838e4da43a3b0751bdcac7fe719f7b4. > > It causes new build regressions with gcc-4.2 which is > pretty common on non-x86 platforms. > > Reported-by: James Bottomley > Signed-off-by: David S. Miller > > and postings that led to this revert including: > > http://marc.info/?l=linux-netdev&m=130653748205263&w=2 Thanks for the pointers; I looked into it a bit deeper and found that the 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ł'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(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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__ == 4) && (__GNUC_MINOR__ == 2) +/* + * GCC 4.2 will sometimes throw an error if the combination of const and + * __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)