From: James Hogan <james.hogan@imgtec.com>
To: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>,
Paul Burton <paul.burton@imgtec.com>,
<linux-kernel@vger.kernel.org>, <linux-mips@linux-mips.org>
Subject: Re: [PATCH] MIPS: fix duplicate define
Date: Wed, 9 Nov 2016 09:53:53 +0000 [thread overview]
Message-ID: <20161109095352.GD9443@jhogan-linux.le.imgtec.org> (raw)
In-Reply-To: <1478641415-6986-1-git-send-email-sudipm.mukherjee@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2214 bytes --]
On Tue, Nov 08, 2016 at 09:43:35PM +0000, Sudip Mukherjee wrote:
> The mips build of ip27_defconfig is failing with the error:
> In file included from ../arch/mips/include/asm/mach-ip27/spaces.h:29:0,
> from ../arch/mips/include/asm/page.h:12,
> from ../arch/mips/vdso/vdso.h:26,
> from ../arch/mips/vdso/gettimeofday.c:11:
> ../arch/mips/include/asm/mach-generic/spaces.h:28:0:
> error: "CAC_BASE" redefined [-Werror]
> #define CAC_BASE _AC(0x80000000, UL)
>
> In file included from ../arch/mips/include/asm/page.h:12:0,
> from ../arch/mips/vdso/vdso.h:26,
> from ../arch/mips/vdso/gettimeofday.c:11:
> ../arch/mips/include/asm/mach-ip27/spaces.h:22:0:
> note: this is the location of the previous definition
> #define CAC_BASE 0xa800000000000000
>
> Add a condition to check if CAC_BASE is already defined, and define it
> only if it is not yet defined.
>
> Fixes: 3ffc17d8768b ("MIPS: Adjust MIPS64 CAC_BASE to reflect Config.K0")
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
> ---
>
> Build log is at:
> https://travis-ci.org/sudipm-mukherjee/parport/jobs/174134289
>
> arch/mips/include/asm/mach-generic/spaces.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h
> index 952b0fd..61b75da 100644
> --- a/arch/mips/include/asm/mach-generic/spaces.h
> +++ b/arch/mips/include/asm/mach-generic/spaces.h
> @@ -23,10 +23,12 @@
>
> #ifdef CONFIG_32BIT
> #ifdef CONFIG_KVM_GUEST
> +#ifndef CAC_BASE
This is wrong. Should it be one line up? Note the else...
> #define CAC_BASE _AC(0x40000000, UL)
> #else
here ^^^
i.e. you appear to be changing
CONFIG_KVM_GUEST:
CAC_BASE=0x40000000
!CONFIG_KVM_GUEST:
CAC_BASE=0x80000000
to:
CONFIG_KVM_GUEST:
!CAC_BASE:
CAC_BASE=0x40000000
CAC_BASE:
CAC_BASE=0x80000000
!CONFIG_KVM_GUEST:
(nothing)
Cheers
James
> #define CAC_BASE _AC(0x80000000, UL)
> #endif
> +#endif
> #ifndef IO_BASE
> #define IO_BASE _AC(0xa0000000, UL)
> #endif
> --
> 1.9.1
>
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
prev parent reply other threads:[~2016-11-09 9:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 21:43 Sudip Mukherjee
2016-11-08 23:46 ` kbuild test robot
2016-11-09 9:53 ` James Hogan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161109095352.GD9443@jhogan-linux.le.imgtec.org \
--to=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=sudipm.mukherjee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome