| Message ID | ecbbf6550654071f13d1bdc04b86dc4d69ad09b4.1445008695.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Oct 16, 2015 at 04:33:41PM +0100, Robin Murphy wrote: > The imminent renaming of __GFP_WAIT in the mm tree conflicts with its > use in the new IOMMU DMA ops; introduce a temporary local version of > its replacement to smooth over the transition. > > This patch should be reverted at 4.4-rc1. > > CC: Mel Gorman <mgorman@techsingularity.net> > CC: Andrew Morton <akpm@linux-foundation.org> > Reported-by: Sudeep Holla <sudeep.holla@arm.com> > Signed-off-by: Robin Murphy <robin.murphy@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Hi Robin, On Fri, Oct 16, 2015 at 04:33:41PM +0100, Robin Murphy wrote: > The imminent renaming of __GFP_WAIT in the mm tree conflicts with its > use in the new IOMMU DMA ops; introduce a temporary local version of > its replacement to smooth over the transition. > > This patch should be reverted at 4.4-rc1. I lost track here, are these two patches required in the iommu tree for the next merge window? Joerg
Hi Joerg, On 28/10/15 00:53, Joerg Roedel wrote: > Hi Robin, > > On Fri, Oct 16, 2015 at 04:33:41PM +0100, Robin Murphy wrote: >> The imminent renaming of __GFP_WAIT in the mm tree conflicts with its >> use in the new IOMMU DMA ops; introduce a temporary local version of >> its replacement to smooth over the transition. >> >> This patch should be reverted at 4.4-rc1. > > I lost track here, are these two patches required in the iommu tree for > the next merge window? Andrew has the equivalent of patch 2 as a fixup on top of Mel's series, which Stephen is currently carrying as a merge resolution in -next. I'm assuming this will go into the final merge as well, so as long as Linus takes the IOMMU tree first we should be OK as-is. Robin. > > > Joerg >
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 6320361..66444df 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -546,6 +546,10 @@ static void flush_page(struct device *dev, const void *virt, phys_addr_t phys) __dma_flush_range(virt, virt + PAGE_SIZE); } +#ifdef __GFP_WAIT +#define gfpflags_allow_blocking(gfp) ((gfp) & __GFP_WAIT) +#endif + static void *__iommu_alloc_attrs(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs)
The imminent renaming of __GFP_WAIT in the mm tree conflicts with its use in the new IOMMU DMA ops; introduce a temporary local version of its replacement to smooth over the transition. This patch should be reverted at 4.4-rc1. CC: Mel Gorman <mgorman@techsingularity.net> CC: Andrew Morton <akpm@linux-foundation.org> Reported-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- Sudeep points out that there are pending changes in -next touching arm64 which I hadn't spotted, which end up breaking the build when merged with my changes in the IOMMU tree. Catalin, would you mind acking these fixes so that Joerg can carry them? We should be able to send the revert through arm64 once the dust has settled. Thanks, Robin. --- arch/arm64/mm/dma-mapping.c | 4 ++++ 1 file changed, 4 insertions(+)