summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Einar Reitan <john.reitan@arm.com>2016-02-04 13:28:28 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2016-03-10 07:58:05 +0000
commit7bc2949ccefe0eba6a009ffe91a2117a8f1f4da6 (patch)
tree7e4c92c416e7eac632c1254d3cf9f78726e32dd3
parent2e086788b11fe6428b289aa99363b2de1c8f57da (diff)
downloadkernel-7bc2949ccefe0eba6a009ffe91a2117a8f1f4da6.tar.gz
ion: Enable __GFP_WAIT/__GFP_RECLAIM
Allow Linux to reclaim memory during our alloc_pages call. This should increase the chance of getting 2MB pages on a stressed system. Change-Id: I125f4840461a4b4f09a41c0936dfd3846db001e4
-rw-r--r--drivers/staging/android/ion/ion_compound_page.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/ion_compound_page.c b/drivers/staging/android/ion/ion_compound_page.c
index 184e093dbdc..5019f75c669 100644
--- a/drivers/staging/android/ion/ion_compound_page.c
+++ b/drivers/staging/android/ion/ion_compound_page.c
@@ -52,10 +52,10 @@ static int pool_page_fillmark = CONFIG_ION_COMPOUND_PAGE_FILLMARK;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
static const gfp_t gfp_flags = (GFP_HIGHUSER | __GFP_ZERO | __GFP_NOWARN |
- __GFP_NORETRY | __GFP_COMP) & ~__GFP_WAIT;
+ __GFP_NORETRY | __GFP_COMP);
#else
static const gfp_t gfp_flags = (GFP_HIGHUSER | __GFP_ZERO | __GFP_NOWARN |
- __GFP_NORETRY | __GFP_COMP) & ~__GFP_RECLAIM;
+ __GFP_NORETRY | __GFP_COMP);
#endif
#ifdef CPP_STATS