diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 02:07:33 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 02:07:33 -0400 |
| commit | 054838bc019c90511d034fb796dc8c7715460fc2 (patch) | |
| tree | a04b9fa86e3cfb8adb285fcd33bd47983f75d8fb /include/linux | |
| parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
| parent | fc69910f329d61821897871e0e957eda39beb3d8 (diff) | |
| download | cachepc-linux-054838bc019c90511d034fb796dc8c7715460fc2.tar.gz cachepc-linux-054838bc019c90511d034fb796dc8c7715460fc2.zip | |
Merge commit 'fc69910f329d' into uaccess.mips
backmerge of a build fix from mainline
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/jump_label.h | 11 | ||||
| -rw-r--r-- | include/linux/user_namespace.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index 8e06d758ee48..2afd74b9d844 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -90,6 +90,13 @@ extern bool static_key_initialized; struct static_key { atomic_t enabled; /* + * Note: + * To make anonymous unions work with old compilers, the static + * initialization of them requires brackets. This creates a dependency + * on the order of the struct with the initializers. If any fields + * are added, STATIC_KEY_INIT_TRUE and STATIC_KEY_INIT_FALSE may need + * to be modified. + * * bit 0 => 1 if key is initially true * 0 if initially false * bit 1 => 1 if points to struct static_key_mod @@ -166,10 +173,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 */ diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index be765234c0a2..32354b4b4b2b 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -72,7 +72,7 @@ struct ucounts { struct hlist_node node; struct user_namespace *ns; kuid_t uid; - atomic_t count; + int count; atomic_t ucount[UCOUNT_COUNTS]; }; |