3.16.81-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Rajmal Menariya <rajmal.menariya@xxxxxxxxxxxxxx> commit 1328d8efef17d5e16bd6e9cfe59130a833674534 upstream. In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT. After this change each bit in bitmap (genalloc - General purpose special memory pool) represents one page size memory. Cc: sprd-ind-kernel-group@xxxxxxxxxxxxxxxx Cc: sanjeev.yadav@xxxxxxxxxxxxxx Cc: Colin Cross <ccross@xxxxxxxxxxx> Cc: Android Kernel Team <kernel-team@xxxxxxxxxxx> Cc: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Sumit Semwal <sumit.semwal@xxxxxxxxxx> Signed-off-by: Rajmal Menariya <rajmal.menariya@xxxxxxxxxxxxxx> [jstultz: Reworked commit message] Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> Acked-by: Laura Abbott <labbott@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> --- drivers/staging/android/ion/ion_carveout_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/android/ion/ion_carveout_heap.c +++ b/drivers/staging/android/ion/ion_carveout_heap.c @@ -168,7 +168,7 @@ struct ion_heap *ion_carveout_heap_creat if (!carveout_heap) return ERR_PTR(-ENOMEM); - carveout_heap->pool = gen_pool_create(12, -1); + carveout_heap->pool = gen_pool_create(PAGE_SHIFT, -1); if (!carveout_heap->pool) { kfree(carveout_heap); return ERR_PTR(-ENOMEM);