Groups > linux.kernel > #1592012

[for-next][PATCH 4/7] jump_label: Fix anonymous union initialization

Path	csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news2.arglkargh.de!news.mixmin.net!weretis.net!feeder4.news.weretis.net!storethat.news.telefonica.de!telefonica.de!news.panservice.it!bofh.it!news.nic.it!robomod
From	Steven Rostedt <rostedt@goodmis.org>
Newsgroups	linux.kernel
Subject	[for-next][PATCH 4/7] jump_label: Fix anonymous union initialization
Date	Fri, 03 Mar 2017 15:50:02 +0100
Message-ID	<tgWGS-2zu-9@gated-at.bofh.it> (permalink)
References	<tgWGR-2zu-5@gated-at.bofh.it>
X-Original-To	linux-kernel@vger.kernel.org
User-Agent	quilt/0.63-1
MIME-Version	1.0
Content-Type	text/plain; charset=ISO-8859-15
Content-Disposition	inline; filename=0004-jump_label-Fix-anonymous-union-initialization.patch
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	39
Organization	linux.* mail to news gateway
X-Original-Cc	Ingo Molnar <mingo@kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Jason Baron <jbaron@akamai.com>, Boris Ostrovsky <boris.ostrovsky@oracle.com>
X-Original-Date	Fri, 03 Mar 2017 09:47:07 -0500
X-Original-Message-ID	<20170303144729.982996453@goodmis.org>
X-Original-References	<20170303144703.437052140@goodmis.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1592012

Show key headers only | View raw

From: Boris Ostrovsky <boris.ostrovsky@oracle.com>

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.

Link: http://lkml.kernel.org/r/1488299542-30765-1-git-send-email-boris.ostrovsky@oracle.com

Fixes: 3821fd35b58d ("jump_label: Reduce the size of struct static_key")
Reviewed-by: Jason Baron <jbaron@akamai.com>
Compiled-by: Chris Mason <clm@fb.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 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 680c98b2f41c..a7f90117cf7d 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -166,10 +166,10 @@ extern void static_key_disable(struct static_key *key);
  */
 #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 */
 
-- 
2.10.2

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[for-next][PATCH 4/7] jump_label: Fix anonymous union initialization Steven Rostedt <rostedt@goodmis.org> - 2017-03-03 15:50 +0100

csiph-web