summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2013-12-13 14:24:41 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-14 08:55:41 -0800
commit1584f40ff0b8f2d1b42a4353f3a27b0c1f8545a5 (patch)
treefd29c2938c9b148e4f9ff00d14edd00d0fda0ff3
parentdef5c4926b3f691dfbcef39a94f206c0f0f3a92f (diff)
gpu: ion: Remove __GFP_NO_KSWAPD
It no longer exists. Signed-off-by: Arve Hjønnevåg <arve@android.com> [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/android/ion/ion_system_heap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index d4f0a564c45..344f7538400 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -27,8 +27,8 @@
#include "ion_priv.h"
static unsigned int high_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |
- __GFP_NOWARN | __GFP_NORETRY |
- __GFP_NO_KSWAPD) & ~__GFP_WAIT;
+ __GFP_NOWARN | __GFP_NORETRY) &
+ ~__GFP_WAIT;
static unsigned int low_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |
__GFP_NOWARN);
static const unsigned int orders[] = {8, 4, 0};