From 5e050e367efbed26d0cd8356f5b0e439ec51f7a0 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 1 Oct 2005 00:00:00 +0100
Subject: [PATCH] --- yaml --- r: 11241 b: refs/heads/master c:
 0015365cc68a5b6ad22dfdac19580aa9530731c3 h: refs/heads/master i:   11239:
 cf82372f8e2caa664ba210e183f8d0f019e53868 v: v3

---
 [refs]                                        |  2 +-
 trunk/include/asm-mips/cache.h                |  3 +--
 trunk/include/asm-mips/mach-generic/kmalloc.h | 13 +++++++++++++
 trunk/include/asm-mips/mach-ip27/kmalloc.h    |  8 ++++++++
 trunk/include/asm-mips/mach-ip32/kmalloc.h    | 12 ++++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 trunk/include/asm-mips/mach-generic/kmalloc.h
 create mode 100644 trunk/include/asm-mips/mach-ip27/kmalloc.h
 create mode 100644 trunk/include/asm-mips/mach-ip32/kmalloc.h

diff --git a/[refs] b/[refs]
index 198f543d9198..d2cb12f41070 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c78cbf49c4edf2f9ca9e56d4b87a5d6ef08b7fed
+refs/heads/master: 0015365cc68a5b6ad22dfdac19580aa9530731c3
diff --git a/trunk/include/asm-mips/cache.h b/trunk/include/asm-mips/cache.h
index 4517bdf20953..1a5d1a669db3 100644
--- a/trunk/include/asm-mips/cache.h
+++ b/trunk/include/asm-mips/cache.h
@@ -10,6 +10,7 @@
 #define _ASM_CACHE_H
 
 #include <linux/config.h>
+#include <kmalloc.h>
 
 #define L1_CACHE_SHIFT		CONFIG_MIPS_L1_CACHE_SHIFT
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
@@ -18,6 +19,4 @@
 #define SMP_CACHE_SHIFT		L1_CACHE_SHIFT
 #define SMP_CACHE_BYTES		L1_CACHE_BYTES
 
-#define ARCH_KMALLOC_MINALIGN	8
-
 #endif /* _ASM_CACHE_H */
diff --git a/trunk/include/asm-mips/mach-generic/kmalloc.h b/trunk/include/asm-mips/mach-generic/kmalloc.h
new file mode 100644
index 000000000000..373d66dee9d7
--- /dev/null
+++ b/trunk/include/asm-mips/mach-generic/kmalloc.h
@@ -0,0 +1,13 @@
+#ifndef __ASM_MACH_GENERIC_KMALLOC_H
+#define __ASM_MACH_GENERIC_KMALLOC_H
+
+#include <linux/config.h>
+
+#ifndef CONFIG_DMA_COHERENT
+/*
+ * Total overkill for most systems but need as a safe default.
+ */
+#define ARCH_KMALLOC_MINALIGN	128
+#endif
+
+#endif /* __ASM_MACH_GENERIC_KMALLOC_H */
diff --git a/trunk/include/asm-mips/mach-ip27/kmalloc.h b/trunk/include/asm-mips/mach-ip27/kmalloc.h
new file mode 100644
index 000000000000..426bd049b2d7
--- /dev/null
+++ b/trunk/include/asm-mips/mach-ip27/kmalloc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_MACH_IP27_KMALLOC_H
+#define __ASM_MACH_IP27_KMALLOC_H
+
+/*
+ * All happy, no need to define ARCH_KMALLOC_MINALIGN
+ */
+
+#endif /* __ASM_MACH_IP27_KMALLOC_H */
diff --git a/trunk/include/asm-mips/mach-ip32/kmalloc.h b/trunk/include/asm-mips/mach-ip32/kmalloc.h
new file mode 100644
index 000000000000..9d2d4d9ac036
--- /dev/null
+++ b/trunk/include/asm-mips/mach-ip32/kmalloc.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_MACH_IP32_KMALLOC_H
+#define __ASM_MACH_IP32_KMALLOC_H
+
+#include <linux/config.h>
+
+#if defined(CONFIG_CPU_R5000) || defined (CONFIG_CPU_RM7000)
+#define ARCH_KMALLOC_MINALIGN	32
+#else
+#define ARCH_KMALLOC_MINALIGN	128
+#endif
+
+#endif /* __ASM_MACH_IP32_KMALLOC_H */