Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd91dd68 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: do not attempt reclaim on higher order allocs"

parents f2eb18e7 292a8942

drivers/iommu/dma-iommu.c

+3 −2
Original line number Diff line number Diff line
@@ -475,8 +475,9 @@ static struct page **__iommu_dma_alloc_pages(unsigned int count, 
			unsigned int order = __fls(order_mask);



			order_size = 1U << order;

			page = alloc_pages((order_mask - order_size) ?

					   gfp | __GFP_NORETRY : gfp, order);

			page = alloc_pages(order ?

					   (gfp | __GFP_NORETRY) &

						~__GFP_RECLAIM : gfp, order);

			if (!page)

				continue;

			if (!order)