diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
| commit | 1ed7d32763857fbdc8e406352404538e41050d22 (patch) | |
| tree | f97c5d8f548141bf7cdec0a9d7f22adb61da6efc /arch/arm/include/asm/dma-mapping.h | |
| parent | 660da7c9228f685b2ebe664f9fd69aaddcc420b5 (diff) | |
| parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
| download | talos-obmc-linux-1ed7d32763857fbdc8e406352404538e41050d22.tar.gz talos-obmc-linux-1ed7d32763857fbdc8e406352404538e41050d22.zip | |
Merge branch 'x86/boot' into x86/mm, to pick up interacting changes
The SME patches we are about to apply add some E820 logic, so merge in
pending E820 code changes first, to have a single code base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 680d3f3889e7..4e0285a66ef8 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -12,18 +12,14 @@ #include <xen/xen.h> #include <asm/xen/hypervisor.h> -#define DMA_ERROR_CODE (~(dma_addr_t)0x0) extern const struct dma_map_ops arm_dma_ops; extern const struct dma_map_ops arm_coherent_dma_ops; static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) { - return &arm_dma_ops; + return IS_ENABLED(CONFIG_MMU) ? &arm_dma_ops : &dma_noop_ops; } -#define HAVE_ARCH_DMA_SUPPORTED 1 -extern int dma_supported(struct device *dev, u64 mask); - #ifdef __arch_page_to_dma #error Please update to __arch_pfn_to_dma #endif |
