summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2012-10-16 15:29:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-31 10:02:58 -0700
commit7b76336ec39f1af832ebd29add93cfe21e839581 (patch)
treea4e1a63e1256cbac908acc1a0644d455ac09b155 /drivers
parentc70fc22aa9f442379b1f64e863b8adf8da2356e8 (diff)
downloadlinux-3.10-7b76336ec39f1af832ebd29add93cfe21e839581.tar.gz
linux-3.10-7b76336ec39f1af832ebd29add93cfe21e839581.tar.bz2
linux-3.10-7b76336ec39f1af832ebd29add93cfe21e839581.zip
Staging: android: binder: Allow using highmem for binder buffers
commit 585650dcec88e704a19bb226a34b6a7166111623 upstream. The default kernel mapping for the pages allocated for the binder buffers is never used. Set the __GFP_HIGHMEM flag when allocating these pages so we don't needlessly use low memory pages that may be required elsewhere. Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/android/binder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 80acd0e6a57..223639a73b0 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -655,7 +655,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE];
BUG_ON(*page);
- *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+ *page = alloc_page(GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
if (*page == NULL) {
printk(KERN_ERR "binder: %d: binder_alloc_buf failed "
"for page at %p\n", proc->pid, page_addr);