Re: [PATCH] m68k: don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire

[Christoph Hellwig]

On Mon, Jul 08, 2019 at 10:39:48PM +0200, Geert Uytterhoeven wrote:
> Hi Christoph,
> 
> On Mon, Jul 8, 2019 at 7:51 PM Christoph Hellwig <hch@xxxxxx> wrote:
> >
> > m68k only provides the dma_prep_coherent symbol when an mmu is enabled
> 
> arch_dma_prep_coherent
> 
> > and not on the coldfire platform.  Fix the Kconfig symbol selection
> > up to match this.
> >
> > Fixes: 69878ef47562 ("m68k: Implement arch_dma_prep_coherent()")
> 
> Do you know the SHA1 for the other commit, that causes the issue when
> combined with the above?

I think the culprit is:

commit c30700db9eaabb35e0b123301df35a6846e6b6b4
Author: Christoph Hellwig <hch@xxxxxx>
Date:   Mon Jun 3 08:43:51 2019 +0200

    dma-direct: provide generic support for uncached kernel segments


Ad it turns out I can't just apply this fix to the dma-mapping tree
because it doesn't have the m68k changes.  So either you'll have to
queue it up, or I'll have to do secondary pull request to fix up
the first one.  Maybe it is eiter if you just send it to Linus
before I send the dma-mapping PR?