From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
kernel test robot <lkp@intel.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
linux-mips@vger.kernel.org
Subject: Re: [PATCH] MIPS: launch.h: add include guard to prevent build errors
Date: Sat, 22 May 2021 11:24:50 -0700 [thread overview]
Message-ID: <CALCv0x0mHPCvknB-jUS8V8t5mnFTMrENcbNA2oFuX+Z2gmPTHg@mail.gmail.com> (raw)
In-Reply-To: <20210521051343.20059-1-rdunlap@infradead.org>
On Thu, May 20, 2021 at 10:13 PM Randy Dunlap <rdunlap@infradead.org> 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(+)
>
> --- linux-next-20210520.orig/arch/mips/include/asm/mips-boards/launch.h
> +++ linux-next-20210520/arch/mips/include/asm/mips-boards/launch.h
> @@ -3,6 +3,9 @@
> *
> */
>
> +#ifndef _ASM_MIPS_BOARDS_LAUNCH_H
> +#define _ASM_MIPS_BOARDS_LAUNCH_H
> +
> #ifndef _ASSEMBLER_
>
> struct cpulaunch {
> @@ -34,3 +37,5 @@ struct cpulaunch {
>
> /* Polling period in count cycles for secondary CPU's */
> #define LAUNCHPERIOD 10000
> +
> +#endif /* _ASM_MIPS_BOARDS_LAUNCH_H */
Thank you for fixing this.
Reviewed-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
next prev parent reply other threads:[~2021-05-22 18:25 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 [this message]
2021-05-25 13:40 ` Thomas Bogendoerfer
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=CALCv0x0mHPCvknB-jUS8V8t5mnFTMrENcbNA2oFuX+Z2gmPTHg@mail.gmail.com \
--to=ilya.lipnitskiy@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=lkp@intel.com \
--cc=rdunlap@infradead.org \
--cc=tsbogend@alpha.franken.de \
/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 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.