summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-07-08 12:55:27 -0700
committerChristoph Hellwig <hch@lst.de>2019-07-08 14:19:33 -0700
commit15ffe5e1acf5fe1512e98b20702e46ce9f25e2f7 (patch)
treeacea919569c3fed31821d423fc4563ce1196ecbb
parent2ee7a4ef98e309a1f496be2b0bf9307b5a7a31e5 (diff)
downloadlinux-stable-15ffe5e1acf5fe1512e98b20702e46ce9f25e2f7.tar.gz
linux-stable-15ffe5e1acf5fe1512e98b20702e46ce9f25e2f7.tar.bz2
linux-stable-15ffe5e1acf5fe1512e98b20702e46ce9f25e2f7.zip
dma-mapping: mark dma_alloc_need_uncached as __always_inline
Without the __always_inline at least i386 configs that have CONFIG_OPTIMIZE_INLINING set seem fail to inline dma_alloc_need_uncached, leading to a linker error because of undefined symbols. Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
-rw-r--r--include/linux/dma-noncoherent.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-noncoherent.h b/include/linux/dma-noncoherent.h
index 53ee36ecdf37..3813211a9aad 100644
--- a/include/linux/dma-noncoherent.h
+++ b/include/linux/dma-noncoherent.h
@@ -23,7 +23,7 @@ static inline bool dev_is_dma_coherent(struct device *dev)
/*
* Check if an allocation needs to be marked uncached to be coherent.
*/
-static inline bool dma_alloc_need_uncached(struct device *dev,
+static __always_inline bool dma_alloc_need_uncached(struct device *dev,
unsigned long attrs)
{
if (dev_is_dma_coherent(dev))