summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/mach-ip32/kmalloc.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-31 03:37:12 +0100
committerPaul Mackerras <paulus@samba.org>2005-10-31 03:37:12 +0100
commit23fd07750a789a66fe88cf173d52a18f1a387da4 (patch)
tree06fdd6df35fdb835abdaa9b754d62f6b84b97250 /include/asm-mips/mach-ip32/kmalloc.h
parentppc: remove duplicate export of cur_cpu_spec (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
downloadlinux-23fd07750a789a66fe88cf173d52a18f1a387da4.tar.xz
linux-23fd07750a789a66fe88cf173d52a18f1a387da4.zip
Merge ../linux-2.6 by hand
Diffstat (limited to 'include/asm-mips/mach-ip32/kmalloc.h')
-rw-r--r--include/asm-mips/mach-ip32/kmalloc.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-mips/mach-ip32/kmalloc.h b/include/asm-mips/mach-ip32/kmalloc.h
new file mode 100644
index 000000000000..9d2d4d9ac036
--- /dev/null
+++ b/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 */