diff options
| -rw-r--r-- | arch/mips64/config.in | 2 | ||||
| -rw-r--r-- | arch/mips64/defconfig | 1 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip22 | 1 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip27 | 1 | ||||
| -rw-r--r-- | include/asm-mips64/cache.h | 5 |
5 files changed, 8 insertions, 2 deletions
diff --git a/arch/mips64/config.in b/arch/mips64/config.in index a424f5561..5aa50eb73 100644 --- a/arch/mips64/config.in +++ b/arch/mips64/config.in @@ -44,6 +44,7 @@ if [ "$CONFIG_SGI_IP22" = "y" ]; then define_bool CONFIG_BOARD_SCACHE y define_bool CONFIG_ARC_MEMORY y define_bool CONFIG_SGI y + define_int CONFIG_L1_CACHE_SHIFT 5 fi if [ "$CONFIG_SGI_IP27" = "y" ]; then @@ -52,6 +53,7 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then define_bool CONFIG_COHERENT_IO y define_bool CONFIG_PCI y define_bool CONFIG_QL_ISP_A64 y + define_int CONFIG_L1_CACHE_SHIFT 7 fi if [ "$CONFIG_ISA" != "y" ]; then diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index 8f8b780b2..84157caef 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -24,6 +24,7 @@ CONFIG_ARC64=y CONFIG_COHERENT_IO=y CONFIG_PCI=y CONFIG_QL_ISP_A64=y +CONFIG_L1_CACHE_SHIFT=7 # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_MCA is not set diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22 index 39518cb59..43b521604 100644 --- a/arch/mips64/defconfig-ip22 +++ b/arch/mips64/defconfig-ip22 @@ -17,6 +17,7 @@ CONFIG_ARC32=y CONFIG_BOARD_SCACHE=y CONFIG_ARC_MEMORY=y CONFIG_SGI=y +CONFIG_L1_CACHE_SHIFT=5 # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_PCI is not set diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27 index 8f8b780b2..84157caef 100644 --- a/arch/mips64/defconfig-ip27 +++ b/arch/mips64/defconfig-ip27 @@ -24,6 +24,7 @@ CONFIG_ARC64=y CONFIG_COHERENT_IO=y CONFIG_PCI=y CONFIG_QL_ISP_A64=y +CONFIG_L1_CACHE_SHIFT=7 # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_MCA is not set diff --git a/include/asm-mips64/cache.h b/include/asm-mips64/cache.h index c05688a72..9c50dff97 100644 --- a/include/asm-mips64/cache.h +++ b/include/asm-mips64/cache.h @@ -10,8 +10,9 @@ #ifndef _ASM_CACHE_H #define _ASM_CACHE_H +#include <linux/config.h> + /* bytes per L1 cache line */ -#define L1_CACHE_BYTES 32 /* A guess */ -#define SMP_CACHE_BYTES L1_CACHE_BYTES +#define L1_CACHE_BYTES (1 << CONFIG_L1_CACHE_SHIFT) #endif /* _ASM_CACHE_H */ |