diff options
-rw-r--r-- | include/linux/gfp.h | 6 | ||||
-rw-r--r-- | mm/page_alloc.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index c37653b6843f..b414be387180 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
@@ -40,9 +40,9 @@ struct vm_area_struct; | |||
40 | #define __GFP_FS ((__force gfp_t)0x80u) /* Can call down to low-level FS? */ | 40 | #define __GFP_FS ((__force gfp_t)0x80u) /* Can call down to low-level FS? */ |
41 | #define __GFP_COLD ((__force gfp_t)0x100u) /* Cache-cold page required */ | 41 | #define __GFP_COLD ((__force gfp_t)0x100u) /* Cache-cold page required */ |
42 | #define __GFP_NOWARN ((__force gfp_t)0x200u) /* Suppress page allocation failure warning */ | 42 | #define __GFP_NOWARN ((__force gfp_t)0x200u) /* Suppress page allocation failure warning */ |
43 | #define __GFP_REPEAT ((__force gfp_t)0x400u) /* Retry the allocation. Might fail */ | 43 | #define __GFP_REPEAT ((__force gfp_t)0x400u) /* See above */ |
44 | #define __GFP_NOFAIL ((__force gfp_t)0x800u) /* Retry for ever. Cannot fail */ | 44 | #define __GFP_NOFAIL ((__force gfp_t)0x800u) /* See above */ |
45 | #define __GFP_NORETRY ((__force gfp_t)0x1000u)/* Do not retry. Might fail */ | 45 | #define __GFP_NORETRY ((__force gfp_t)0x1000u)/* See above */ |
46 | #define __GFP_COMP ((__force gfp_t)0x4000u)/* Add compound page metadata */ | 46 | #define __GFP_COMP ((__force gfp_t)0x4000u)/* Add compound page metadata */ |
47 | #define __GFP_ZERO ((__force gfp_t)0x8000u)/* Return zeroed page on success */ | 47 | #define __GFP_ZERO ((__force gfp_t)0x8000u)/* Return zeroed page on success */ |
48 | #define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */ | 48 | #define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */ |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 88eb59dd7ac6..6965be064a31 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1611,8 +1611,9 @@ nofail_alloc: | |||
1611 | * Don't let big-order allocations loop unless the caller explicitly | 1611 | * Don't let big-order allocations loop unless the caller explicitly |
1612 | * requests that. Wait for some write requests to complete then retry. | 1612 | * requests that. Wait for some write requests to complete then retry. |
1613 | * | 1613 | * |
1614 | * In this implementation, __GFP_REPEAT means __GFP_NOFAIL for order | 1614 | * In this implementation, either order <= PAGE_ALLOC_COSTLY_ORDER or |
1615 | * <= 3, but that may not be true in other implementations. | 1615 | * __GFP_REPEAT mean __GFP_NOFAIL, but that may not be true in other |
1616 | * implementations. | ||
1616 | */ | 1617 | */ |
1617 | do_retry = 0; | 1618 | do_retry = 0; |
1618 | if (!(gfp_mask & __GFP_NORETRY)) { | 1619 | if (!(gfp_mask & __GFP_NORETRY)) { |