Messages in this thread | | | Subject | Re: [PATCH] jump_label: Fix anonymous union initialization | From | Jason Baron <> | Date | Thu, 2 Mar 2017 16:07:19 -0500 |
| |
On 02/28/2017 11:32 AM, Boris Ostrovsky wrote: > Pre-4.6 gcc do not allow direct static initialization of members of > anonymous structs/unions. After commit 3821fd35b58d ("jump_label: > Reduce the size of struct static_key") STATIC_KEY_INIT_{TRUE|FALSE} > definitions cannot be compiled with those older compilers. > > Placing initializers inside curved brackets works around this problem. > > Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> > --- > include/linux/jump_label.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h > index 8e06d75..518020b 100644 > --- a/include/linux/jump_label.h > +++ b/include/linux/jump_label.h > @@ -166,10 +166,10 @@ extern void arch_jump_label_transform_static(struct jump_entry *entry, > */ > #define STATIC_KEY_INIT_TRUE \ > { .enabled = { 1 }, \ > - .entries = (void *)JUMP_TYPE_TRUE } > + { .entries = (void *)JUMP_TYPE_TRUE } } > #define STATIC_KEY_INIT_FALSE \ > { .enabled = { 0 }, \ > - .entries = (void *)JUMP_TYPE_FALSE } > + { .entries = (void *)JUMP_TYPE_FALSE } } > > #else /* !HAVE_JUMP_LABEL */ > >
(Adding Steve to 'cc)
Thanks for the fix.
Reviewed-by: Jason Baron <jbaron@akamai.com>
Thanks,
-Jason
| |