From patchwork Sun Aug 12 13:00:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John David Anglin X-Patchwork-Id: 1309631 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1880BDF280 for ; Sun, 12 Aug 2012 13:02:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751949Ab2HLNBa (ORCPT ); Sun, 12 Aug 2012 09:01:30 -0400 Received: from [65.55.111.106] ([65.55.111.106]:40838 "EHLO blu0-omc2-s31.blu0.hotmail.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751703Ab2HLNB1 (ORCPT ); Sun, 12 Aug 2012 09:01:27 -0400 Received: from BLU0-SMTP83 ([65.55.111.72]) by blu0-omc2-s31.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 Aug 2012 06:00:57 -0700 X-Originating-IP: [174.92.93.236] X-Originating-Email: [dave.anglin@bell.net] Message-ID: Received: from [192.168.2.10] ([174.92.93.236]) by BLU0-SMTP83.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sun, 12 Aug 2012 06:00:56 -0700 CC: Fengguang Wu , linux-alpha@vger.kernel.org, Richard Henderson , Ivan Kokshaysky , Matt Turner , Tony Luck , James Bottomley , Mel Gorman , kernel-janitors@vger.kernel.org, Kyle McMartin , Andrew Morton , LKML , Parisc List From: John David Anglin To: Michael Cree In-Reply-To: <50271811.9090006@orcon.net.nz> Subject: Re: [next:akpm 129/309] net/core/sock.c:274:36: error: initializer element is not constant MIME-Version: 1.0 (Apple Message framework v936) Date: Sun, 12 Aug 2012 09:00:39 -0400 References: <1343042420.3027.11.camel@dabdike.int.hansenpartnership.com> <20120723114258.GV9222@suse.de> <20120723122905.GA22476@localhost> <20120724074844.GA9519@localhost> <1343193053.3139.6.camel@dabdike> <20120802150209.GA26601@localhost> <502707D5.7020602@orcon.net.nz> <20120812021013.GA8442@localhost> <50271811.9090006@orcon.net.nz> X-Mailer: Apple Mail (2.936) X-OriginalArrivalTime: 12 Aug 2012 13:00:56.0413 (UTC) FILETIME=[831CB8D0:01CD788A] Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org On 11-Aug-12, at 10:42 PM, Michael Cree wrote: > On 12/08/12 14:10, Fengguang Wu wrote: >> On Sun, Aug 12, 2012 at 01:33:09PM +1200, Michael Cree wrote: >>> On 03/08/12 03:02, Fengguang Wu wrote: >>>> On Thu, Jul 26, 2012 at 10:06:41AM -0700, Tony Luck wrote: >>>>> On Tue, Jul 24, 2012 at 10:10 PM, James Bottomley >>>>> wrote: >>>>>>> Here is the line in sock.i: >>>>>>> >>>>>>> struct static_key memalloc_socks = ((struct static_key) >>>>>>> { .enabled = >>>>>>> ((atomic_t) { (0) }) }); >>>>>> >>>>>> The above line contains two compound literals. It also uses a >>>>>> designated >>>>>> initializer to initialize the field enabled. A compound >>>>>> literal is not a >>>>>> constant expression. >>>>> >>>>> Seeing the same thing on ia64 building next-20120726. Same fix >>>>> works >>>>> for me ... so I'll steal this whole changelog and attributes. >>>> >>>> I got the same error for alpha, the same fix applies. >>> >>> Just trying this patch on Alpha against v3.6-rc1 and it leads to new >>> compilation errors, namely: >>> >>> init/init_task.c:12: error: braced-group within expression allowed >>> only >>> inside a function >>> init/init_task.c:13: error: braced-group within expression allowed >>> only >>> inside a function >>> init/init_task.c:16: error: braced-group within expression allowed >>> only >>> inside a function >>> init/init_task.c:16: error: braced-group within expression allowed >>> only >>> inside a function >>> make[1]: *** [init/init_task.o] Error 1 >> >> Sorry! This will actually compile: >> >> -#define ATOMIC_INIT(i) ( { (i) } ) >> +#define ATOMIC_INIT(i) { (i) } > > Thanks, it now compiles correctly. I'm currently collecting Alpha > patches to send on to Linus so will include this one. A similar change applied to 3.5.1 stable compiles successfully on parisc. Regards, Dave --- John David Anglin dave.anglin@bell.net diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h index 6c6defc..af9cf30 100644 --- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -141,7 +141,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u) #define atomic_sub_and_test(i,v) (atomic_sub_return((i),(v)) == 0) -#define ATOMIC_INIT(i) ((atomic_t) { (i) }) +#define ATOMIC_INIT(i) { (i) } #define smp_mb__before_atomic_dec() smp_mb() #define smp_mb__after_atomic_dec() smp_mb() @@ -150,7 +150,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u) #ifdef CONFIG_64BIT -#define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) +#define ATOMIC64_INIT(i) { (i) } static __inline__ s64 __atomic64_add_return(s64 i, atomic64_t *v)