diff options
Diffstat (limited to 'lib/radix-tree.c')
-rw-r--r-- | lib/radix-tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 637d55608de5..aa9bfd0bdbd1 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c | |||
@@ -160,13 +160,13 @@ static inline int tag_get(struct radix_tree_node *node, unsigned int tag, | |||
160 | 160 | ||
161 | static inline void root_tag_set(struct radix_tree_root *root, unsigned int tag) | 161 | static inline void root_tag_set(struct radix_tree_root *root, unsigned int tag) |
162 | { | 162 | { |
163 | root->gfp_mask |= (1 << (tag + __GFP_BITS_SHIFT)); | 163 | root->gfp_mask |= (__force gfp_t)(1 << (tag + __GFP_BITS_SHIFT)); |
164 | } | 164 | } |
165 | 165 | ||
166 | 166 | ||
167 | static inline void root_tag_clear(struct radix_tree_root *root, unsigned int tag) | 167 | static inline void root_tag_clear(struct radix_tree_root *root, unsigned int tag) |
168 | { | 168 | { |
169 | root->gfp_mask &= ~(1 << (tag + __GFP_BITS_SHIFT)); | 169 | root->gfp_mask &= (__force gfp_t)~(1 << (tag + __GFP_BITS_SHIFT)); |
170 | } | 170 | } |
171 | 171 | ||
172 | static inline void root_tag_clear_all(struct radix_tree_root *root) | 172 | static inline void root_tag_clear_all(struct radix_tree_root *root) |
@@ -176,7 +176,7 @@ static inline void root_tag_clear_all(struct radix_tree_root *root) | |||
176 | 176 | ||
177 | static inline int root_tag_get(struct radix_tree_root *root, unsigned int tag) | 177 | static inline int root_tag_get(struct radix_tree_root *root, unsigned int tag) |
178 | { | 178 | { |
179 | return root->gfp_mask & (1 << (tag + __GFP_BITS_SHIFT)); | 179 | return (__force unsigned)root->gfp_mask & (1 << (tag + __GFP_BITS_SHIFT)); |
180 | } | 180 | } |
181 | 181 | ||
182 | /* | 182 | /* |