From: Randy Dunlap <rdunlap@infradead.org>
To: Youling Tang <tangyouling@loongson.cn>,
Huacai Chen <chenhuacai@kernel.org>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] MIPS: Loongson64: Fix build error 'secondary_kexec_args' undeclared under !SMP
Date: Wed, 5 May 2021 19:19:27 -0700 [thread overview]
Message-ID: <1e8a74a8-3139-c77a-3eab-4ae0ff42ee0b@infradead.org> (raw)
In-Reply-To: <1620266570-21585-1-git-send-email-tangyouling@loongson.cn>
On 5/5/21 7:02 PM, Youling Tang wrote:
> On the Loongson64 platform, if CONFIG_SMP is not set, the following build
> error will occur:
> arch/mips/loongson64/reset.c:133:2: error:'secondary_kexec_args' undeclared
>
> Because the definition and declaration of secondary_kexec_args are in the
> CONFIG_SMP, the secondary_kexec_args variable should be used in CONFIG_SMP.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Youling Tang <tangyouling@loongson.cn>
> ---
> arch/mips/loongson64/reset.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/loongson64/reset.c b/arch/mips/loongson64/reset.c
> index c97bfdc..758d5d2 100644
> --- a/arch/mips/loongson64/reset.c
> +++ b/arch/mips/loongson64/reset.c
> @@ -126,11 +126,12 @@ static void loongson_kexec_shutdown(void)
> for_each_possible_cpu(cpu)
> if (!cpu_online(cpu))
> cpu_device_up(get_cpu_device(cpu));
> +
> + secondary_kexec_args[0] = TO_UNCAC(0x3ff01000);
> #endif
> kexec_args[0] = kexec_argc;
> kexec_args[1] = fw_arg1;
> kexec_args[2] = fw_arg2;
> - secondary_kexec_args[0] = TO_UNCAC(0x3ff01000);
> memcpy((void *)fw_arg1, kexec_argv, KEXEC_ARGV_SIZE);
> memcpy((void *)fw_arg2, kexec_envp, KEXEC_ENVP_SIZE);
> }
> @@ -141,7 +142,9 @@ static void loongson_crash_shutdown(struct pt_regs *regs)
> kexec_args[0] = kdump_argc;
> kexec_args[1] = fw_arg1;
> kexec_args[2] = fw_arg2;
> +#ifdef CONFIG_SMP
> secondary_kexec_args[0] = TO_UNCAC(0x3ff01000);
> +#endif
> memcpy((void *)fw_arg1, kdump_argv, KEXEC_ARGV_SIZE);
> memcpy((void *)fw_arg2, kexec_envp, KEXEC_ENVP_SIZE);
> }
>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Yep, slightly better than my version:
https://lore.kernel.org/lkml/20210430205055.13594-1-rdunlap@infradead.org/
--
~Randy
next prev parent reply other threads:[~2021-05-06 2:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 2:02 Youling Tang
2021-05-06 2:19 ` Randy Dunlap [this message]
2021-05-06 2:34 ` Youling Tang
2021-05-06 2:21 ` Jinyang He
2021-05-06 3:02 ` Youling Tang
2021-05-11 20:42 ` 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=1e8a74a8-3139-c77a-3eab-4ae0ff42ee0b@infradead.org \
--to=rdunlap@infradead.org \
--cc=chenhuacai@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=tangyouling@loongson.cn \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®