Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751114AbdCBVKs (ORCPT ); Thu, 2 Mar 2017 16:10:48 -0500 Received: from prod-mail-xrelay07.akamai.com ([23.79.238.175]:58306 "EHLO prod-mail-xrelay07.akamai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbdCBVKr (ORCPT ); Thu, 2 Mar 2017 16:10:47 -0500 Subject: Re: [PATCH] jump_label: Fix anonymous union initialization To: Boris Ostrovsky , Steven Rostedt References: <1488299542-30765-1-git-send-email-boris.ostrovsky@oracle.com> Cc: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org From: Jason Baron Message-ID: <1eba35cd-2b1f-64e5-0fe1-9756316b37b7@akamai.com> Date: Thu, 2 Mar 2017 16:07:19 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <1488299542-30765-1-git-send-email-boris.ostrovsky@oracle.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1289 Lines: 41 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 Thanks, -Jason