Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
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
In-Reply-To: <20210401023900.3114325-1-liushixin2@huawei.com>
References: <20210401023900.3114325-1-liushixin2@huawei.com>
Date:   Thu, 01 Apr 2021 10:21:04 +0200
Message-ID: <87pmzes9e7.fsf@vitty.brq.redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Shixin Liu <liushixin2@huawei.com> writes:

> When compiling with defconfig on x86_64, I got a warning:
>
> drivers/acpi/processor_idle.c: In function =E2=80=98acpi_idle_play_dead=
=E2=80=99:
> drivers/acpi/processor_idle.c:542:15: warning: extra tokens at end of #if=
def 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;
>=20=20
> -#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).

--=20
Vitaly