linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: linux-kernel@vger.kernel.org, kernel test robot <lkp@intel.com>,
	linux-mips@vger.kernel.org,
	Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Subject: Re: [PATCH] MIPS: launch.h: add include guard to prevent build errors
Date: Tue, 25 May 2021 15:40:39 +0200	[thread overview]
Message-ID: <20210525134039.GD11166@alpha.franken.de> (raw)
In-Reply-To: <20210521051343.20059-1-rdunlap@infradead.org>

On Thu, May 20, 2021 at 10:13:43PM -0700, Randy Dunlap wrote:
> arch/mips/include/asm/mips-boards/launch.h needs an include guard
> to prevent it from being #included more than once.
> Prevents these build errors:
> 
> In file included from ../arch/mips/mti-malta/malta-amon.c:16:
> ../arch/mips/include/asm/mips-boards/launch.h:8:8: error: redefinition of 'struct cpulaunch'
>     8 | struct cpulaunch {
>       |        ^~~~~~~~~
> In file included from ../arch/mips/include/asm/mips-cps.h:13,
>                  from ../arch/mips/include/asm/smp-ops.h:16,
>                  from ../arch/mips/include/asm/smp.h:21,
>                  from ../include/linux/smp.h:114,
>                  from ../arch/mips/mti-malta/malta-amon.c:12:
> ../arch/mips/include/asm/mips-boards/launch.h:8:8: note: originally defined here
>     8 | struct cpulaunch {
>       |        ^~~~~~~~~
> make[3]: [../scripts/Makefile.build:273: arch/mips/mti-malta/malta-amon.o] Error 1 (ignored)
> 
> Fixes: 6decd1aad15f ("MIPS: add support for buggy MT7621S core detection")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: kernel test robot <lkp@intel.com>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: linux-mips@vger.kernel.org
> Cc: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> ---
>  arch/mips/include/asm/mips-boards/launch.h |    5 +++++
>  1 file changed, 5 insertions(+)

applied to mips-fixes.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

      parent reply	other threads:[~2021-05-25 13:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-21  5:13 [PATCH] MIPS: launch.h: add include guard to prevent build errors Randy Dunlap
2021-05-22 18:24 ` Ilya Lipnitskiy
2021-05-25 13:40 ` Thomas Bogendoerfer [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=20210525134039.GD11166@alpha.franken.de \
    --to=tsbogend@alpha.franken.de \
    --cc=ilya.lipnitskiy@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=lkp@intel.com \
    --cc=rdunlap@infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).