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

Commit 3056d6be authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Don't invoke OOM killer during dma_alloc_coherent() 



There is a fallback logic, so it's better to not use the OOM killer
in the allocations.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 554d284b

arch/x86_64/kernel/pci-dma.c

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 
	if (dma_mask == 0)

		dma_mask = 0xffffffff;



	/* Don't invoke OOM killer */

	gfp |= __GFP_NORETRY;



	/* Kludge to make it bug-to-bug compatible with i386. i386

	   uses the normal dma_mask for alloc_coherent. */

	dma_mask &= *dev->dma_mask;