diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/mips/include/asm/mach-ip32/kmalloc.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/mips/include/asm/mach-ip32/kmalloc.h')
| -rw-r--r-- | arch/mips/include/asm/mach-ip32/kmalloc.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-ip32/kmalloc.h b/arch/mips/include/asm/mach-ip32/kmalloc.h new file mode 100644 index 000000000000..b1e0be60f720 --- /dev/null +++ b/arch/mips/include/asm/mach-ip32/kmalloc.h | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | #ifndef __ASM_MACH_IP32_KMALLOC_H | ||
| 2 | #define __ASM_MACH_IP32_KMALLOC_H | ||
| 3 | |||
| 4 | |||
| 5 | #if defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_RM7000) | ||
| 6 | #define ARCH_KMALLOC_MINALIGN 32 | ||
| 7 | #else | ||
| 8 | #define ARCH_KMALLOC_MINALIGN 128 | ||
| 9 | #endif | ||
| 10 | |||
| 11 | #endif /* __ASM_MACH_IP32_KMALLOC_H */ | ||