Re: linux-next: build warning after merge of the pm tree

From: Vitaly Kuznetsov
Date: Wed Mar 31 2021 - 02:23:45 EST


Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:

> Hi all,
>
> After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
> produced this 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)
> | ^
>

Sigh, smaller the patch, more iterations it will take to make it
right....

Rafael,

something went wrong when you folded in my "[PATCH] ACPI: processor: Fix
build when !CONFIG_HOTPLUG_CPU" here. This line should be:

#if defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU)

(not #ifdef defined ...)

> Introduced by commit
>
> bc5706eaeae0 ("ACPI: processor: Fix CPU0 wakeup in acpi_idle_play_dead()")


--
Vitaly