Messages in this thread | | | Date | Fri, 8 Nov 2019 10:25:17 +0000 | From | Catalin Marinas <> | Subject | Re: linux-next: manual merge of the arm64 tree with the dma-mapping tree |
| |
On Fri, Nov 08, 2019 at 08:11:09AM +1100, Stephen Rothwell wrote: > diff --cc include/linux/dma-direct.h > index 6db863c3eb93,d03af3605460..000000000000 > --- a/include/linux/dma-direct.h > +++ b/include/linux/dma-direct.h > @@@ -3,11 -3,10 +3,13 @@@ > #define _LINUX_DMA_DIRECT_H 1 > > #include <linux/dma-mapping.h> > +#include <linux/memblock.h> /* for min_low_pfn */ > #include <linux/mem_encrypt.h> > > + extern unsigned int zone_dma_bits; > + > +static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); > + > #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA > #include <asm/dma-direct.h> > #else
The resolution is fine. Thanks Stephen.
-- Catalin
| |