diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-02-13 08:01:03 +0100 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2019-02-18 22:41:01 +1100 |
| commit | fbce251baa6e357441961c78796e5e9fad682675 (patch) | |
| tree | 24046692c1c2ad9ad828c12109cea99689014364 /kernel/dma/direct.c | |
| parent | net: pasemi: set a 64-bit DMA mask on the DMA device (diff) | |
| download | linux-dev-fbce251baa6e357441961c78796e5e9fad682675.tar.xz linux-dev-fbce251baa6e357441961c78796e5e9fad682675.zip | |
dma-direct: we might need GFP_DMA for 32-bit dma masks
If there is no ZONE_DMA32 we might need GFP_DMA to be able to
allocate memory that satisfies a 32-bit DMA mask.
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'kernel/dma/direct.c')
| -rw-r--r-- | kernel/dma/direct.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 355d16acee6d..d5bb51cf27c6 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -132,8 +132,7 @@ again: goto again; } - if (IS_ENABLED(CONFIG_ZONE_DMA) && - phys_mask < DMA_BIT_MASK(32) && !(gfp & GFP_DMA)) { + if (IS_ENABLED(CONFIG_ZONE_DMA) && !(gfp & GFP_DMA)) { gfp = (gfp & ~GFP_DMA32) | GFP_DMA; goto again; } |