summaryrefslogtreecommitdiffstats
path: root/arch/mips/netlogic
diff options
context:
space:
mode:
authorChristoph Hellwig2017-12-22 16:05:15 +0100
committerChristoph Hellwig2018-01-15 09:34:55 +0100
commit57bf5a8963f80fb3828c46c3e3a5b2dd790e09a7 (patch)
tree17ccc31f02cbc09c8a51c8b95acf50f0b62e366b /arch/mips/netlogic
parentdma-mapping: warn when there is no coherent_dma_mask (diff)
downloadkernel-qcow2-linux-57bf5a8963f80fb3828c46c3e3a5b2dd790e09a7.tar.gz
kernel-qcow2-linux-57bf5a8963f80fb3828c46c3e3a5b2dd790e09a7.tar.xz
kernel-qcow2-linux-57bf5a8963f80fb3828c46c3e3a5b2dd790e09a7.zip
dma-mapping: clear harmful GFP_* flags in common code
Lift the code from x86 so that we behave consistently. In the future we should probably warn if any of these is set. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> [m68k]
Diffstat (limited to 'arch/mips/netlogic')
-rw-r--r--arch/mips/netlogic/common/nlm-dma.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/netlogic/common/nlm-dma.c b/arch/mips/netlogic/common/nlm-dma.c
index 0ec9d9da6d51..49c975b6aa28 100644
--- a/arch/mips/netlogic/common/nlm-dma.c
+++ b/arch/mips/netlogic/common/nlm-dma.c
@@ -47,9 +47,6 @@ static char *nlm_swiotlb;
static void *nlm_dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
{
- /* ignore region specifiers */
- gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
-
#ifdef CONFIG_ZONE_DMA32
if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
gfp |= __GFP_DMA32;