| Message ID | 20210401023900.3114325-1-liushixin2@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [-next] ACPI: processor: Fix a prepocessor warning | expand |
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).
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();
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(-)