summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/mach-ip32/kmalloc.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 21:19:15 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 21:19:15 +0200
commite9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch)
tree318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /include/asm-mips/mach-ip32/kmalloc.h
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
parentUpdate MIPS defconfig files. (diff)
downloadlinux-e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab.tar.xz
linux-e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab.zip
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
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 */