summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/mach-ip32/kmalloc.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-29 23:49:12 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-10-29 23:49:12 +0200
commitb0c4e148bd591629749d02a8fbc8d81c26d548cf (patch)
tree3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /include/asm-mips/mach-ip32/kmalloc.h
parentMerge branch 'upstream' (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.xz
linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.zip
Merge branch 'master'
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 */