On 19 July 2013 10:26, Yoichi Yuasa <yuasa@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx> > --- > 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
