Skip to content
  • Paul Burton's avatar
    Revert "MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>." · ae5b0675
    Paul Burton authored
    Commit 296e46db ("MIPS: Don't unnecessarily include kmalloc.h into
    <asm/cache.h>.") claimed that the inclusion of the machine's kmalloc.h
    from asm/cache.h is unnecessary, but this is not true.
    
    Without including kmalloc.h we don't get a definition for
    ARCH_DMA_MINALIGN, which means we no longer suitably align DMA. Further
    to this the definition of ARCH_KMALLOC_MINALIGN provided by linux/slab.h
    ends up being set to the alignment of an unsigned long long value rather
    than to ARCH_DMA_MINALIGN, which means that buffers allocated using
    kmalloc may no longer be safely aligned for use with DMA.
    
    Fix this by re-adding the include of kmalloc.h in asm/cache.h. This
    reverts commit 296e46db
    
     ("MIPS: Don't unnecessarily include
    kmalloc.h into <asm/cache.h>.")
    
    Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
    Fixes: 296e46db ("MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>.")
    Cc: linux-mips@linux-mips.org
    Cc: stable <stable@vger.kernel.org> # v4.12+
    Patchwork: https://patchwork.linux-mips.org/patch/16895/
    
    
    Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
    ae5b0675