ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into dma-mapping-for-next

Browse Source 
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.
This commit is contained in:
Christoph Hellwig
2019-11-21 18:13:03 +01:00
parent 68a33b1794 bff3b04460
commit d7293f79ca
9 changed files with 107 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/dma-direct.h
View File

@@ -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