Merge "common: dma-mapping: make dma_common_contiguous_remap more robust" (293f841e) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/base/dma-mapping.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -309,7 +309,12 @@ void dma_common_contiguous_remap(struct page page, size_t size,
		void *ptr;
		unsigned long pfn;

		pages = kmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL);
		pages = kmalloc(sizeof(struct page *) << get_order(size),
		GFP_KERNEL \| __GFP_NOWARN);

		if (!pages)
		pages = vmalloc(sizeof(struct page *) << get_order(size));

		if (!pages)
		return NULL;

		@@ -318,7 +323,7 @@ void dma_common_contiguous_remap(struct page page, size_t size,

		ptr = dma_common_pages_remap(pages, size, vm_flags, prot, caller);

		kfree(pages);
		kvfree(pages);

		return ptr;
		}