Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd8d860d authored by Boris Ostrovsky's avatar Boris Ostrovsky Committed by Steven Rostedt (VMware)
Browse files

jump_label: Fix anonymous union initialization 

Pre-4.6 gcc do not allow direct static initialization of members of
anonymous structs/unions. After commit 3821fd35 ("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: 3821fd35 ("jump_label: Reduce the size of struct static_key")
Reviewed-by: default avatarJason Baron <jbaron@akamai.com>
Compiled-by: default avatarChris Mason <clm@fb.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent ab426321

include/linux/jump_label.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */