diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2017-03-21 17:40:43 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2017-04-10 05:56:08 -0400 |
commit | 294d62743754f1fefefccccb09f8deec48f00969 (patch) | |
tree | aad61bcf06c2940b5c747e8c85132f5ce0ef76fd | |
parent | 4437637c3277fa9aba4e443329b5db3b6d34eedf (diff) |
MIPS: Delete redundant definition of SMP_CACHE_BYTES.
<linux/cache.h> already defines SMP_CACHE_BYTES as L1_CACHE_BYTES.
This change results in a build error in <asm/cpu-info.h> which directly
includes <asm/cache.h>. Fix this by including <linux/cache.h> instead.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/include/asm/cache.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/cpu-info.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h index d7e314b6be09..fc67947ed658 100644 --- a/arch/mips/include/asm/cache.h +++ b/arch/mips/include/asm/cache.h | |||
@@ -12,8 +12,6 @@ | |||
12 | #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT | 12 | #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT |
13 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | 13 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
14 | 14 | ||
15 | #define SMP_CACHE_BYTES L1_CACHE_BYTES | ||
16 | |||
17 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) | 15 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
18 | 16 | ||
19 | #endif /* _ASM_CACHE_H */ | 17 | #endif /* _ASM_CACHE_H */ |
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h index edbe2734a1bf..d43b3045109e 100644 --- a/arch/mips/include/asm/cpu-info.h +++ b/arch/mips/include/asm/cpu-info.h | |||
@@ -12,10 +12,9 @@ | |||
12 | #ifndef __ASM_CPU_INFO_H | 12 | #ifndef __ASM_CPU_INFO_H |
13 | #define __ASM_CPU_INFO_H | 13 | #define __ASM_CPU_INFO_H |
14 | 14 | ||
15 | #include <linux/cache.h> | ||
15 | #include <linux/types.h> | 16 | #include <linux/types.h> |
16 | 17 | ||
17 | #include <asm/cache.h> | ||
18 | |||
19 | /* | 18 | /* |
20 | * Descriptor for a cache | 19 | * Descriptor for a cache |
21 | */ | 20 | */ |