From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 21 Mar 2017 21:40:43 +0000 (+0100)
Subject: MIPS: Delete redundant definition of SMP_CACHE_BYTES.
X-Git-Tag: v4.14-rc1~914^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=294d62743754f1fefefccccb09f8deec48f00969;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
index d7e314b..fc67947 100644
--- a/arch/mips/include/asm/cache.h
+++ b/arch/mips/include/asm/cache.h
@@ -12,8 +12,6 @@
 #define L1_CACHE_SHIFT		CONFIG_MIPS_L1_CACHE_SHIFT
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
 
-#define SMP_CACHE_BYTES		L1_CACHE_BYTES
-
 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
 
 #endif /* _ASM_CACHE_H */
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h
index edbe273..d43b304 100644
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -12,10 +12,9 @@
 #ifndef __ASM_CPU_INFO_H
 #define __ASM_CPU_INFO_H
 
+#include <linux/cache.h>
 #include <linux/types.h>
 
-#include <asm/cache.h>
-
 /*
  * Descriptor for a cache
  */