From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751685AbdCBWg7 (ORCPT ); Thu, 2 Mar 2017 17:36:59 -0500 Received: from mail.kernel.org ([198.145.29.136]:43176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751831AbdCBWgY (ORCPT ); Thu, 2 Mar 2017 17:36:24 -0500 Date: Thu, 2 Mar 2017 16:42:00 -0500 From: Steven Rostedt To: Jason Baron Cc: Boris Ostrovsky , peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, Chris Mason Subject: Re: [PATCH] jump_label: Fix anonymous union initialization Message-ID: <20170302164200.143b10ff@gandalf.local.home> In-Reply-To: <1eba35cd-2b1f-64e5-0fe1-9756316b37b7@akamai.com> References: <1488299542-30765-1-git-send-email-boris.ostrovsky@oracle.com> <1eba35cd-2b1f-64e5-0fe1-9756316b37b7@akamai.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2 Mar 2017 16:07:19 -0500 Jason Baron wrote: > 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 > > --- > > 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 Funny, Chris pinged me on IRC telling me that jump labels broke with my latest tree. And we discovered it was because of anonymous unions and he was using an older compiler (4.4 or something). I didn't know how to make it work, and we were just going to say "tough, jump labels are not for 4.4". Although, didn't goto asm get added into 4.5? Did someone backport it to the gcc 4.4 compilers? I believe 4.5 handles anonymous unions. Since the broken commit went through my tree, I'll take this patch. I'm getting ready for another git pull request to Linus. -- Steve