This is a note to let you know that I've just added the patch titled

staging: android: ion: fix sys heap pool's gfp_flags

to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-next branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release during the merge window.

If you have any questions about this process, please let me know.

From 9bcf065e28122588a6cbee08cf847826dacbb438 Mon Sep 17 00:00:00 2001

From: Qing Xia saberlily.xia@hisilicon.com Date: Fri, 1 Feb 2019 14:59:46 +0800 Subject: staging: android: ion: fix sys heap pool's gfp_flags

In the first loop, gfp_flags will be modified to high_order_gfp_flags, and there will be no chance to change back to low_order_gfp_flags.

Fixes: e7f63771b60e ("ION: Sys_heap: Add cached pool to spead up cached buffer alloc") Signed-off-by: Qing Xia saberlily.xia@hisilicon.com Cc: stable stable@vger.kernel.org Signed-off-by: Jing Xia jing.xia@unisoc.com Reviewed-by: Yuming Han yuming.han@unisoc.com Reviewed-by: Zhaoyang Huang zhaoyang.huang@unisoc.com Reviewed-by: Orson Zhai orson.zhai@unisoc.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/staging/android/ion/ion_system_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index ec526a464db8..aa8d8425be25 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -224,10 +224,10 @@ static void ion_system_heap_destroy_pools(struct ion_page_pool **pools) static int ion_system_heap_create_pools(struct ion_page_pool **pools) { int i; - gfp_t gfp_flags = low_order_gfp_flags;

for (i = 0; i < NUM_ORDERS; i++) { struct ion_page_pool *pool; + gfp_t gfp_flags = low_order_gfp_flags;

if (orders[i] > 4) gfp_flags = high_order_gfp_flags;