diff options
| author | Boris Ostrovsky <[email protected]> | 2017-02-28 11:32:22 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <[email protected]> | 2017-03-03 09:44:59 -0500 |
| commit | cd8d860dcce906cd477be7d0648ba6f56a52eaa6 (patch) | |
| tree | 39be53d0e0e6e8799092369a14cb7fb595527b09 | |
| parent | ab42632156becd35d3884ee5c14da2bedbf3149a (diff) | |
jump_label: Fix anonymous union initialization
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/[email protected]
Fixes: 3821fd35b58d ("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]>
| -rw-r--r-- | include/linux/jump_label.h | 4 |
1 files 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 */ |