imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-31 06:14:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

jump_label: Fix anonymous union initialization

Browse Source 
Pre-4.6 gcc do not allow direct static initialization of members of
anonymous structs/unions. After commit 3821fd35b5 ("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/[email protected]

Fixes: 3821fd35b5 ("jump_label: Reduce the size of struct static_key")
Reviewed-by: Jason Baron <[email protected]>
Compiled-by: Chris Mason <[email protected]>
Signed-off-by: Boris Ostrovsky <[email protected]>
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
This commit is contained in:
Boris Ostrovsky authored and Steven Rostedt (VMware) committed 2017-03-03 09:44:59 -05:00
1 parent ab42632156
commit cd8d860dcc
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/jump_label.h
+2 -2
View File
@@ -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 */