Patch "Revert "MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>."" has been added to the 4.12-stable tree

This is a note to let you know that I've just added the patch titled

Revert "MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>."

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
revert-mips-don-t-unnecessarily-include-kmalloc.h-into-asm-cache.h.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Paul Burton <[email protected]>
Date: Tue, 1 Aug 2017 13:32:57 -0700
Subject: Revert "MIPS: Don't unnecessarily include kmalloc.h into <asm/cache.h>."

From: Paul Burton <[email protected]>

commit ae5b0675942ab30cde96099c68a2290bd1aafcca upstream.

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>.")

Patchwork: https://patchwork.linux-mips.org/patch/16895/

---
 arch/mips/include/asm/cache.h |    2 ++
 1 file changed, 2 insertions(+)

@@ -9,6 +9,8 @@
 #ifndef _ASM_CACHE_H
 #define _ASM_CACHE_H
 
+#include <kmalloc.h>
+
 #define L1_CACHE_SHIFT		CONFIG_MIPS_L1_CACHE_SHIFT
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/revert-mips-don-t-unnecessarily-include-kmalloc.h-into-asm-cache.h.patch