Subject: [PATCH] MIPS: ar7: fix redefined UNCAC_BASE and IO_BASE

From: Yoichi Yuasa <[email-masked]>
Date: Fri, 19 Jul 2013 18:26:11 +0900

In file included from arch/mips/include/asm/mach-ar7/spaces.h:23:0,
                 from arch/mips/include/asm/addrspace.h:13,
                 from arch/mips/include/asm/barrier.h:11,
                 from arch/mips/include/asm/bitops.h:18,
                 from include/linux/bitops.h:22,
                 from include/linux/kernel.h:10,
                 from include/asm-generic/bug.h:13,
                 from arch/mips/include/asm/bug.h:41,
                 from include/linux/bug.h:4,
                 from include/linux/page-flags.h:9,
                 from kernel/bounds.c:9:
arch/mips/include/asm/mach-generic/spaces.h:28:0: warning: "IO_BASE" redefined [enabled by default]
In file included from arch/mips/include/asm/addrspace.h:13:0,
                 from arch/mips/include/asm/barrier.h:11,
                 from arch/mips/include/asm/bitops.h:18,
                 from include/linux/bitops.h:22,
                 from include/linux/kernel.h:10,
                 from include/asm-generic/bug.h:13,
                 from arch/mips/include/asm/bug.h:41,
                 from include/linux/bug.h:4,
                 from include/linux/page-flags.h:9,
                 from kernel/bounds.c:9:
arch/mips/include/asm/mach-ar7/spaces.h:21:0: note: this is the location of the previous definition
In file included from arch/mips/include/asm/mach-ar7/spaces.h:23:0,
                 from arch/mips/include/asm/addrspace.h:13,
                 from arch/mips/include/asm/barrier.h:11,
                 from arch/mips/include/asm/bitops.h:18,
                 from include/linux/bitops.h:22,
                 from include/linux/kernel.h:10,
                 from include/asm-generic/bug.h:13,
                 from arch/mips/include/asm/bug.h:41,
                 from include/linux/bug.h:4,
                 from include/linux/page-flags.h:9,
                 from kernel/bounds.c:9:
arch/mips/include/asm/mach-generic/spaces.h:29:0: warning: "UNCAC_BASE" redefined [enabled by default]
In file included from arch/mips/include/asm/addrspace.h:13:0,
                 from arch/mips/include/asm/barrier.h:11,
                 from arch/mips/include/asm/bitops.h:18,
                 from include/linux/bitops.h:22,
                 from include/linux/kernel.h:10,
                 from include/asm-generic/bug.h:13,
                 from arch/mips/include/asm/bug.h:41,
                 from include/linux/bug.h:4,
                 from include/linux/page-flags.h:9,
                 from kernel/bounds.c:9:
arch/mips/include/asm/mach-ar7/spaces.h:20:0: note: this is the location of the previous definition
In file included from arch/mips/include/asm/mach-ar7/spaces.h:23:0,

Signed-off-by: Yoichi Yuasa <[email-masked]>
---
 arch/mips/include/asm/mach-generic/spaces.h |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h
index 5b2f2e6..c5d12b4 100644
--- a/arch/mips/include/asm/mach-generic/spaces.h
+++ b/arch/mips/include/asm/mach-generic/spaces.h
@@ -20,13 +20,22 @@
 #endif
 
 #ifdef CONFIG_32BIT
+
+#ifndef CAC_BASE
 #ifdef CONFIG_KVM_GUEST
 #define CAC_BASE		_AC(0x40000000, UL)
 #else
 #define CAC_BASE		_AC(0x80000000, UL)
 #endif
+#endif
+
+#ifndef IO_BASE
 #define IO_BASE			_AC(0xa0000000, UL)
+#endif
+
+#ifndef UNCAC_BASE
 #define UNCAC_BASE		_AC(0xa0000000, UL)
+#endif
 
 #ifndef MAP_BASE
 #ifdef CONFIG_KVM_GUEST
-- 
1.7.9.5

---

From: Markos Chandras <[email-masked]>
Date: Fri, 19 Jul 2013 12:35:36 +0100

> +++ b/arch/mips/include/asm/mach-generic/spaces.h

Hi,

Isn't this similar to http://patchwork.linux-mips.org/patch/5583/ ?

--
Regards,
Markos Chandras - Gentoo Linux Developer
http://dev.gentoo.org/~hwoarang

---

From: Yoichi Yuasa <[email-masked]>
Date: Mon, 22 Jul 2013 14:04:33 +0900

Hi,

On Fri, 19 Jul 2013 12:35:36 +0100

> Isn't this similar to http://patchwork.linux-mips.org/patch/5583/ ?

Sure, thank you for pointing out.

I think that it is better to also include CAC_BASE.

Yoichi