summaryrefslogtreecommitdiff
path: root/include/linux/dma-direct.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-11-21 20:13:03 +0300
committerChristoph Hellwig <hch@lst.de>2019-11-21 20:13:03 +0300
commitd7293f79caea45c50c0ab4294847e7af96501ced (patch)
tree04d55fbe33562f4d242e0445baae55690ebb6682 /include/linux/dma-direct.h
parent68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6 (diff)
parentbff3b04460a80f425442fe8e5c6ee8c3ebef611f (diff)
downloadlinux-d7293f79caea45c50c0ab4294847e7af96501ced.tar.xz
Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into dma-mapping-for-next
Pull in a stable branch from the arm64 tree that adds the zone_dma_bits variable to avoid creating hard to resolve conflicts with that addition.
Diffstat (limited to 'include/linux/dma-direct.h')
-rw-r--r--include/linux/dma-direct.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
index 99b77dd5f79b..452f5280cde3 100644
--- a/include/linux/dma-direct.h
+++ b/include/linux/dma-direct.h
@@ -6,6 +6,8 @@
#include <linux/memblock.h> /* for min_low_pfn */
#include <linux/mem_encrypt.h>
+extern unsigned int zone_dma_bits;
+
#ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
#include <asm/dma-direct.h>
#else