Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 20241ad409fbc42d9e7f92f5fdb4783b7f1b36eb

Authored by Al Viro
Committed by Linus Torvalds
1 parent fa1f5ea860
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] gfp annotations: radix_tree_root 

struct radix_tree_root has unused upper bits of ->gfp_mask reused for
tags bitmap.  Annotated.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -160,13 +160,13 @@
160 160  
161 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 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 172 static inline void root_tag_clear_all(struct radix_tree_root *root)
... ... @@ -176,7 +176,7 @@
176 176  
177 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 /*