summaryrefslogtreecommitdiff
path: root/net/l2tp
diff options
context:
space:
mode:
authorQais Yousef <qais.yousef@imgtec.com>2015-12-11 13:41:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-12-12 10:15:34 -0800
commit9530d0fe129c0197d5df13319ccefd08a827383b (patch)
treedd1f94143c0bd097a3d9d8faca08bea984262ac1 /net/l2tp
parent2d33fa1059da4c8e816627a688d950b613ec0474 (diff)
MIPS: fix DMA contiguous allocation
Recent changes to how GFP_ATOMIC is defined seems to have broken the condition to use mips_alloc_from_contiguous() in mips_dma_alloc_coherent(). I couldn't bottom out the exact change but I think it's this commit d0164adc89f6 ("mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd"). GFP_ATOMIC has multiple bits set and the check for !(gfp & GFP_ATOMIC) isn't enough. The reason behind this condition is to check whether we can potentially do a sleeping memory allocation. Use gfpflags_allow_blocking() instead which should be more robust. Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> Acked-by: Mel Gorman <mgorman@techsingularity.net> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions