Merge "ion: ion_system_heap: update supported page-orders for ion pool" (b04d0fd6) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/android/ion/ion_system_heap.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* drivers/staging/android/ion/ion_system_heap.c
		*
		* Copyright (C) 2011 Google, Inc.
		* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		@@ -36,7 +36,11 @@ static gfp_t high_order_gfp_flags = (GFP_HIGHUSER \| __GFP_NOWARN \|
		static gfp_t low_order_gfp_flags = (GFP_HIGHUSER \| __GFP_NOWARN);

		#ifndef CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS
		static const unsigned int orders[] = {9, 8, 4, 0};
		#if defined(CONFIG_IOMMU_IO_PGTABLE_ARMV7S)
		static const unsigned int orders[] = {8, 4, 0};
		#else
		static const unsigned int orders[] = {9, 4, 0};
		#endif
		#else
		static const unsigned int orders[] = {0};
		#endif