* [PATCH] locking/qspinlock: Fix build for anonymous union in older gcc compilers
@ 2018-06-22 0:35 Steven Rostedt
2018-06-22 2:05 ` Waiman Long
2018-06-22 7:49 ` Will Deacon
0 siblings, 2 replies; 3+ messages in thread
From: Steven Rostedt @ 2018-06-22 0:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Steven Rostedt (VMware) <rostedt@goodmis.org>
One of my tests compiles the kernel with gcc 4.5.3, and I hit the
following build error:
/work/git/linux-trace.git/include/linux/semaphore.h: In function 'sema_init':
/work/git/linux-trace.git/include/linux/semaphore.h:35:17: error: unknown field 'val' specified in initializer
/work/git/linux-trace.git/include/linux/semaphore.h:35:17: warning: missing braces around initializer
/work/git/linux-trace.git/include/linux/semaphore.h:35:17: warning: (near initialization for '(anonymous).raw_lock.<anonymous>.val')
In file included from /work/git/linux-trace.git/include/linux/sched/user.h:7:0,
from /work/git/linux-trace.git/include/linux/cred.h:22,
from /work/git/linux-trace.git/include/linux/seq_file.h:12,
from /work/git/linux-trace.git/include/linux/cgroup.h:18,
from /work/git/linux-trace.git/include/linux/memcontrol.h:22,
from /work/git/linux-trace.git/include/linux/swap.h:9,
from /work/git/linux-trace.git/include/linux/suspend.h:5,
from /work/git/linux-trace.git/arch/x86/kernel/asm-offsets.c:13:
I bisected it down to the introduction of the commit that makes
qspinlock have an anonymous union, which makes initializing it special
for older compilers. By adding strategic brackets, it makes the build
happy again.
Fixes: 625e88be1f41 ("locking/qspinlock: Merge 'struct __qspinlock' into 'struct qspinlock'")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
diff --git a/include/asm-generic/qspinlock_types.h b/include/asm-generic/qspinlock_types.h
index 0763f065b975..d10f1e7d6ba8 100644
--- a/include/asm-generic/qspinlock_types.h
+++ b/include/asm-generic/qspinlock_types.h
@@ -63,7 +63,7 @@ typedef struct qspinlock {
/*
* Initializier
*/
-#define __ARCH_SPIN_LOCK_UNLOCKED { .val = ATOMIC_INIT(0) }
+#define __ARCH_SPIN_LOCK_UNLOCKED { { .val = ATOMIC_INIT(0) } }
/*
* Bitfields in the atomic value:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] locking/qspinlock: Fix build for anonymous union in older gcc compilers
2018-06-22 0:35 [PATCH] locking/qspinlock: Fix build for anonymous union in older gcc compilers Steven Rostedt
@ 2018-06-22 2:05 ` Waiman Long
2018-06-22 7:49 ` Will Deacon
1 sibling, 0 replies; 3+ messages in thread
From: Waiman Long @ 2018-06-22 2:05 UTC (permalink / raw)
To: linux-arm-kernel
On 06/22/2018 08:35 AM, Steven Rostedt wrote:
> From: Steven Rostedt (VMware) <rostedt@goodmis.org>
>
> One of my tests compiles the kernel with gcc 4.5.3, and I hit the
> following build error:
>
> /work/git/linux-trace.git/include/linux/semaphore.h: In function 'sema_init':
> /work/git/linux-trace.git/include/linux/semaphore.h:35:17: error: unknown field 'val' specified in initializer
> /work/git/linux-trace.git/include/linux/semaphore.h:35:17: warning: missing braces around initializer
> /work/git/linux-trace.git/include/linux/semaphore.h:35:17: warning: (near initialization for '(anonymous).raw_lock.<anonymous>.val')
> In file included from /work/git/linux-trace.git/include/linux/sched/user.h:7:0,
> from /work/git/linux-trace.git/include/linux/cred.h:22,
> from /work/git/linux-trace.git/include/linux/seq_file.h:12,
> from /work/git/linux-trace.git/include/linux/cgroup.h:18,
> from /work/git/linux-trace.git/include/linux/memcontrol.h:22,
> from /work/git/linux-trace.git/include/linux/swap.h:9,
> from /work/git/linux-trace.git/include/linux/suspend.h:5,
> from /work/git/linux-trace.git/arch/x86/kernel/asm-offsets.c:13:
>
>
> I bisected it down to the introduction of the commit that makes
> qspinlock have an anonymous union, which makes initializing it special
> for older compilers. By adding strategic brackets, it makes the build
> happy again.
>
> Fixes: 625e88be1f41 ("locking/qspinlock: Merge 'struct __qspinlock' into 'struct qspinlock'")
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
> diff --git a/include/asm-generic/qspinlock_types.h b/include/asm-generic/qspinlock_types.h
> index 0763f065b975..d10f1e7d6ba8 100644
> --- a/include/asm-generic/qspinlock_types.h
> +++ b/include/asm-generic/qspinlock_types.h
> @@ -63,7 +63,7 @@ typedef struct qspinlock {
> /*
> * Initializier
> */
> -#define __ARCH_SPIN_LOCK_UNLOCKED { .val = ATOMIC_INIT(0) }
> +#define __ARCH_SPIN_LOCK_UNLOCKED { { .val = ATOMIC_INIT(0) } }
>
> /*
> * Bitfields in the atomic value:
Acked-by: Waiman Long <longman@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] locking/qspinlock: Fix build for anonymous union in older gcc compilers
2018-06-22 0:35 [PATCH] locking/qspinlock: Fix build for anonymous union in older gcc compilers Steven Rostedt
2018-06-22 2:05 ` Waiman Long
@ 2018-06-22 7:49 ` Will Deacon
1 sibling, 0 replies; 3+ messages in thread
From: Will Deacon @ 2018-06-22 7:49 UTC (permalink / raw)
To: linux-arm-kernel
Hi Steve,
On Thu, Jun 21, 2018 at 08:35:26PM -0400, Steven Rostedt wrote:
> From: Steven Rostedt (VMware) <rostedt@goodmis.org>
>
> One of my tests compiles the kernel with gcc 4.5.3, and I hit the
> following build error:
>
> /work/git/linux-trace.git/include/linux/semaphore.h: In function 'sema_init':
> /work/git/linux-trace.git/include/linux/semaphore.h:35:17: error: unknown field 'val' specified in initializer
> /work/git/linux-trace.git/include/linux/semaphore.h:35:17: warning: missing braces around initializer
> /work/git/linux-trace.git/include/linux/semaphore.h:35:17: warning: (near initialization for '(anonymous).raw_lock.<anonymous>.val')
> In file included from /work/git/linux-trace.git/include/linux/sched/user.h:7:0,
> from /work/git/linux-trace.git/include/linux/cred.h:22,
> from /work/git/linux-trace.git/include/linux/seq_file.h:12,
> from /work/git/linux-trace.git/include/linux/cgroup.h:18,
> from /work/git/linux-trace.git/include/linux/memcontrol.h:22,
> from /work/git/linux-trace.git/include/linux/swap.h:9,
> from /work/git/linux-trace.git/include/linux/suspend.h:5,
> from /work/git/linux-trace.git/arch/x86/kernel/asm-offsets.c:13:
>
>
> I bisected it down to the introduction of the commit that makes
> qspinlock have an anonymous union, which makes initializing it special
> for older compilers. By adding strategic brackets, it makes the build
> happy again.
>
> Fixes: 625e88be1f41 ("locking/qspinlock: Merge 'struct __qspinlock' into 'struct qspinlock'")
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
Cheers for spotting this and fixing it up! I know it's already in -tip, but
anyway:
Acked-by: Will Deacon <will.deacon@arm.com>
Will
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-22 7:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-22 0:35 [PATCH] locking/qspinlock: Fix build for anonymous union in older gcc compilers Steven Rostedt
2018-06-22 2:05 ` Waiman Long
2018-06-22 7:49 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).