linux-kernel - Re: [PATCH -next] ACPI: processor: Fix a prepocessor warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <87pmzes9e7.fsf@vitty.brq.redhat.com>
Date:   Thu, 01 Apr 2021 10:21:04 +0200
From:   Vitaly Kuznetsov <vkuznets@...hat.com>
To:     Shixin Liu <liushixin2@...wei.com>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
        Shixin Liu <liushixin2@...wei.com>, Len Brown <lenb@...nel.org>
Subject: Re: [PATCH -next] ACPI: processor: Fix a prepocessor warning

Shixin Liu <liushixin2@...wei.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@...wei.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