diff options
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b13bc5e5bd7d..07a654486f75 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1932,7 +1932,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) | |||
1932 | const gfp_t wait = gfp_mask & __GFP_WAIT; | 1932 | const gfp_t wait = gfp_mask & __GFP_WAIT; |
1933 | 1933 | ||
1934 | /* __GFP_HIGH is assumed to be the same as ALLOC_HIGH to save a branch. */ | 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 | * The caller may dip into page reserves a bit more if the caller | 1938 | * The caller may dip into page reserves a bit more if the caller |
@@ -1940,7 +1940,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) | |||
1940 | * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will | 1940 | * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will |
1941 | * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH). | 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 | if (!wait) { | 1945 | if (!wait) { |
1946 | alloc_flags |= ALLOC_HARDER; | 1946 | alloc_flags |= ALLOC_HARDER; |