Skip to content

Commit

Permalink
Fix ARCH_KMALLOC_MINALIGN values on MIPS
Browse files Browse the repository at this point in the history
    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Oct 29, 2005
1 parent c78cbf4 commit 0015365
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
3 changes: 1 addition & 2 deletions include/asm-mips/cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 */
13 changes: 13 additions & 0 deletions include/asm-mips/mach-generic/kmalloc.h
Original file line number Diff line number Diff line change
@@ -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 */
8 changes: 8 additions & 0 deletions include/asm-mips/mach-ip27/kmalloc.h
Original file line number Diff line number Diff line change
@@ -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 */
12 changes: 12 additions & 0 deletions include/asm-mips/mach-ip32/kmalloc.h
Original file line number Diff line number Diff line change
@@ -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 */

0 comments on commit 0015365

Please sign in to comment.