Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+1 -4
-2
arch/mips/include/asm/cache.h
··· 12 12 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT 13 13 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 14 14 15 - #define SMP_CACHE_BYTES L1_CACHE_BYTES 16 - 17 15 #define __read_mostly __attribute__((__section__(".data..read_mostly"))) 18 16 19 17 #endif /* _ASM_CACHE_H */
+1 -2
arch/mips/include/asm/cpu-info.h
··· 12 12 #ifndef __ASM_CPU_INFO_H 13 13 #define __ASM_CPU_INFO_H 14 14 15 + #include <linux/cache.h> 15 16 #include <linux/types.h> 16 - 17 - #include <asm/cache.h> 18 17 19 18 /* 20 19 * Descriptor for a cache