Commit 0015365c authored by Ralf Baechle's avatar Ralf Baechle

Fix ARCH_KMALLOC_MINALIGN values on MIPS

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c78cbf49
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#define _ASM_CACHE_H #define _ASM_CACHE_H
#include <linux/config.h> #include <linux/config.h>
#include <kmalloc.h>
#define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
...@@ -18,6 +19,4 @@ ...@@ -18,6 +19,4 @@
#define SMP_CACHE_SHIFT L1_CACHE_SHIFT #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
#define SMP_CACHE_BYTES L1_CACHE_BYTES #define SMP_CACHE_BYTES L1_CACHE_BYTES
#define ARCH_KMALLOC_MINALIGN 8
#endif /* _ASM_CACHE_H */ #endif /* _ASM_CACHE_H */
#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 */
#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 */
#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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment