From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: Shixin Liu <liushixin2@huawei.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Shixin Liu <liushixin2@huawei.com>, Len Brown <lenb@kernel.org>
Subject: Re: [PATCH -next] ACPI: processor: Fix a prepocessor warning
Date: Thu, 01 Apr 2021 10:21:04 +0200 [thread overview]
Message-ID: <87pmzes9e7.fsf@vitty.brq.redhat.com> (raw)
In-Reply-To: <20210401023900.3114325-1-liushixin2@huawei.com>
Shixin Liu <liushixin2@huawei.com> writes:
> When compiling with defconfig on x86_64, I got a warning:
>
> drivers/acpi/processor_idle.c: In function ‘acpi_idle_play_dead’:
> drivers/acpi/processor_idle.c:542:15: warning: extra tokens at end of #ifdef directive
> 542 | #ifdef defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU)
> |
>
> Fixes: bc5706eaeae0 ("ACPI: processor: Fix CPU0 wakeup in acpi_idle_play_dead()")
> Signed-off-by: Shixin Liu <liushixin2@huawei.com>
> ---
> drivers/acpi/processor_idle.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
> index 19fb28a8005b..0925b1477230 100644
> --- a/drivers/acpi/processor_idle.c
> +++ b/drivers/acpi/processor_idle.c
> @@ -539,7 +539,7 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index)
> } else
> return -ENODEV;
>
> -#ifdef defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU)
> +#if defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU)
> /* If NMI wants to wake up CPU0, start CPU0. */
> if (wakeup_cpu0())
> start_cpu0();
Thank you for the patch,
this was already reported by Stephen Rothwell and I suggested Rafael the
exact same fix:
https://lore.kernel.org/lkml/87czvfu9j5.fsf@vitty.brq.redhat.com/
It would probably be better if we fold the fix in (if stil possible).
--
Vitaly
prev parent reply other threads:[~2021-04-01 8:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 2:39 [PATCH -next] ACPI: processor: Fix a prepocessor warning Shixin Liu
2021-04-01 8:21 ` Vitaly Kuznetsov [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=87pmzes9e7.fsf@vitty.brq.redhat.com \
--to=vkuznets@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liushixin2@huawei.com \
--cc=rjw@rjwysocki.net \
/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).