diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
| commit | 10c9850cb2ced2ce528e5b692c639974213a64ec (patch) | |
| tree | f8063beac0ba1dab069d25661845c5b7ef9a67c7 /arch/mips/include/asm/cpu-features.h | |
| parent | 0c2364791343e4b04cd1f097ff2abc2799062448 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/cpu-features.h')
| -rw-r--r-- | arch/mips/include/asm/cpu-features.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index 8baa9033b181..721b698bfe3c 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h | |||
| @@ -428,6 +428,9 @@ | |||
| 428 | #ifndef cpu_scache_line_size | 428 | #ifndef cpu_scache_line_size |
| 429 | #define cpu_scache_line_size() cpu_data[0].scache.linesz | 429 | #define cpu_scache_line_size() cpu_data[0].scache.linesz |
| 430 | #endif | 430 | #endif |
| 431 | #ifndef cpu_tcache_line_size | ||
| 432 | #define cpu_tcache_line_size() cpu_data[0].tcache.linesz | ||
| 433 | #endif | ||
| 431 | 434 | ||
| 432 | #ifndef cpu_hwrena_impl_bits | 435 | #ifndef cpu_hwrena_impl_bits |
| 433 | #define cpu_hwrena_impl_bits 0 | 436 | #define cpu_hwrena_impl_bits 0 |