On Thu, Jul 26, 2012 at 10:06:41AM -0700, Tony Luck wrote:
> On Tue, Jul 24, 2012 at 10:10 PM, James Bottomley
> <[email protected]> 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.
---
From: Mel Gorman <[email protected]>
Subject: [PATCH] [ALPHA] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
The following build error occurred during an alpha build:
net/core/sock.c:274:36: error: initializer element is not constant
Dave Anglin says:
> 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.
The location of the above statement isn't fully clear, but if a compound
literal occurs outside the body of a function, the initializer list must
consist of constant expressions.
Reported-by: Fengguang Wu <[email protected]>
Signed-off-by: Mel Gorman <[email protected]>
Cc: <[email protected]>
---
arch/alpha/include/asm/atomic.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux.orig/arch/alpha/include/asm/atomic.h 2012-05-24 19:03:06.000000000 +0800
+++ linux/arch/alpha/include/asm/atomic.h 2012-08-02 23:01:02.243224220 +0800
@@ -14,8 +14,8 @@
*/
-#define ATOMIC_INIT(i) ( (atomic_t) { (i) } )
-#define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )
+#define ATOMIC_INIT(i) ( { (i) } )
+#define ATOMIC64_INIT(i) ( { (i) } )
#define atomic_read(v) (*(volatile int *)&(v)->counter)
#define atomic64_read(v) (*(volatile long *)&(v)->counter)
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
>> <[email protected]> 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
> ---
> From: Mel Gorman <[email protected]>
> Subject: [PATCH] [ALPHA] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
>
> The following build error occurred during an alpha build:
>
> net/core/sock.c:274:36: error: initializer element is not constant
>
> Dave Anglin says:
>> 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.
>
> The location of the above statement isn't fully clear, but if a compound
> literal occurs outside the body of a function, the initializer list must
> consist of constant expressions.
>
> Reported-by: Fengguang Wu <[email protected]>
> Signed-off-by: Mel Gorman <[email protected]>
> Cc: <[email protected]>
> ---
> arch/alpha/include/asm/atomic.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux.orig/arch/alpha/include/asm/atomic.h 2012-05-24 19:03:06.000000000 +0800
> +++ linux/arch/alpha/include/asm/atomic.h 2012-08-02 23:01:02.243224220 +0800
> @@ -14,8 +14,8 @@
> */
>
>
> -#define ATOMIC_INIT(i) ( (atomic_t) { (i) } )
> -#define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )
> +#define ATOMIC_INIT(i) ( { (i) } )
> +#define ATOMIC64_INIT(i) ( { (i) } )
>
> #define atomic_read(v) (*(volatile int *)&(v)->counter)
> #define atomic64_read(v) (*(volatile long *)&(v)->counter)
Cheers
Michael.
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
> >> <[email protected]> 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) }
Ditto for the 64bit version. I'll send the updated patch.
Thanks,
Fengguang
From: Mel Gorman <[email protected]>
The following build error occurred during an alpha build:
net/core/sock.c:274:36: error: initializer element is not constant
Dave Anglin says:
> 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.
The location of the above statement isn't fully clear, but if a compound
literal occurs outside the body of a function, the initializer list must
consist of constant expressions.
Cc: <[email protected]>
Signed-off-by: Mel Gorman <[email protected]>
Signed-off-by: Fengguang Wu <[email protected]>
---
arch/alpha/include/asm/atomic.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux.orig/arch/alpha/include/asm/atomic.h 2012-08-12 10:12:36.667523339 +0800
+++ linux/arch/alpha/include/asm/atomic.h 2012-08-12 10:12:37.659523362 +0800
@@ -14,8 +14,8 @@
*/
-#define ATOMIC_INIT(i) ( (atomic_t) { (i) } )
-#define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )
+#define ATOMIC_INIT(i) { (i) }
+#define ATOMIC64_INIT(i) { (i) }
#define atomic_read(v) (*(volatile int *)&(v)->counter)
#define atomic64_read(v) (*(volatile long *)&(v)->counter)
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
>>>> <[email protected]> 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.
Cheers
Michael.
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
>>>>> <[email protected]> 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 [email protected]
On Sun, 12 Aug 2012 10:14:05 +0800
Fengguang Wu <[email protected]> wrote:
> From: Mel Gorman <[email protected]>
>
> The following build error occurred during an alpha build:
>
> net/core/sock.c:274:36: error: initializer element is not constant
>
> Dave Anglin says:
> > 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.
>
> The location of the above statement isn't fully clear, but if a compound
> literal occurs outside the body of a function, the initializer list must
> consist of constant expressions.
>
> Cc: <[email protected]>
> Signed-off-by: Mel Gorman <[email protected]>
> Signed-off-by: Fengguang Wu <[email protected]>
I'll remvoe the Cc:stable from this one - the regression is post-3.5.