2021-03-31 00:31:36

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build warning after merge of the pm tree

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)
| ^

Introduced by commit

bc5706eaeae0 ("ACPI: processor: Fix CPU0 wakeup in acpi_idle_play_dead()")

--
Cheers,
Stephen Rothwell

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2021-03-31 06:24:58

by Vitaly Kuznetsov

[permalink] [raw]
Subject: Re: linux-next: build warning after merge of the pm tree

Stephen Rothwell <[email protected]> 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

2021-04-02 17:19:11

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: linux-next: build warning after merge of the pm tree

On Wednesday, March 31, 2021 8:22:54 AM CEST Vitaly Kuznetsov wrote:
> Stephen Rothwell <[email protected]> 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)

Right, my mistake, sorry. Fixed yesterday.

Thanks!