Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e6223a3b19421e3a8df1352d21fd0d71093f44ae

Authored by Namhyung Kim
Committed by Linus Torvalds
1 parent 0116651c85
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

mm: add casts to/from gfp_t in gfp_to_alloc_flags() 

This removes following warning from sparse:

 mm/page_alloc.c:1934:9: warning: restricted gfp_t degrades to integer

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

... ... @@ -1932,7 +1932,7 @@
1932 1932 const gfp_t wait = gfp_mask & __GFP_WAIT;
1933 1933  
1934 1934 /* __GFP_HIGH is assumed to be the same as ALLOC_HIGH to save a branch. */
1935   - BUILD_BUG_ON(__GFP_HIGH != ALLOC_HIGH);
  1935 + BUILD_BUG_ON(__GFP_HIGH != (__force gfp_t) ALLOC_HIGH);
1936 1936  
1937 1937 /*
1938 1938 * The caller may dip into page reserves a bit more if the caller
... ... @@ -1940,7 +1940,7 @@
1940 1940 * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will
1941 1941 * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH).
1942 1942 */
1943   - alloc_flags |= (gfp_mask & __GFP_HIGH);
  1943 + alloc_flags |= (__force int) (gfp_mask & __GFP_HIGH);
1944 1944  
1945 1945 if (!wait) {
1946 1946 alloc_flags |= ALLOC_HARDER;