All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] MIPS: ar7: fix redefined UNCAC_BASE and IO_BASE
@ 2013-07-19  9:26 Yoichi Yuasa
  2013-07-19 11:35 ` Markos Chandras
  0 siblings, 1 reply; 3+ messages in thread
From: Yoichi Yuasa @ 2013-07-19  9:26 UTC (permalink / raw)
  To: ralf; +Cc: yuasa, linux-mips

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 <yuasa@linux-mips.org>
---
 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

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: ar7: fix redefined UNCAC_BASE and IO_BASE
  2013-07-19  9:26 [PATCH] MIPS: ar7: fix redefined UNCAC_BASE and IO_BASE Yoichi Yuasa
@ 2013-07-19 11:35 ` Markos Chandras
  2013-07-22  5:04   ` Yoichi Yuasa
  0 siblings, 1 reply; 3+ messages in thread
From: Markos Chandras @ 2013-07-19 11:35 UTC (permalink / raw)
  To: Yoichi Yuasa; +Cc: ralf, linux-mips

On 19 July 2013 10:26, Yoichi Yuasa <yuasa@linux-mips.org> wrote:
> 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 <yuasa@linux-mips.org>
> ---
>  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
>
>

Hi,

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

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: ar7: fix redefined UNCAC_BASE and IO_BASE
  2013-07-19 11:35 ` Markos Chandras
@ 2013-07-22  5:04   ` Yoichi Yuasa
  0 siblings, 0 replies; 3+ messages in thread
From: Yoichi Yuasa @ 2013-07-22  5:04 UTC (permalink / raw)
  To: Markos Chandras; +Cc: yuasa, ralf, linux-mips

Hi,

On Fri, 19 Jul 2013 12:35:36 +0100
Markos Chandras <hwoarang@gentoo.org> wrote:

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-22  5:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-19  9:26 [PATCH] MIPS: ar7: fix redefined UNCAC_BASE and IO_BASE Yoichi Yuasa
2013-07-19 11:35 ` Markos Chandras
2013-07-22  5:04   ` Yoichi Yuasa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.