]> asedeno.scripts.mit.edu Git - linux.git/commit
Revert "MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>."
authorPaul Burton <paul.burton@imgtec.com>
Tue, 1 Aug 2017 20:32:57 +0000 (13:32 -0700)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 7 Aug 2017 10:01:17 +0000 (12:01 +0200)
commitae5b0675942ab30cde96099c68a2290bd1aafcca
tree4f9bba1293e67fdb02f00594f1e6e4c0226e484c
parentbed58464303fabdbf126544cbdd95a9e1c2e9949
Revert "MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>."

Commit 296e46db0073 ("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 296e46db0073 ("MIPS: Don't unnecessarily include
kmalloc.h into <asm/cache.h>.")

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 296e46db0073 ("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: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/cache.h