From patchwork Thu Apr 1 02:39:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 413702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64577C433B4 for ; Thu, 1 Apr 2021 02:40:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 32A9E61059 for ; Thu, 1 Apr 2021 02:40:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233167AbhDACj6 (ORCPT ); Wed, 31 Mar 2021 22:39:58 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:15839 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233090AbhDACj1 (ORCPT ); Wed, 31 Mar 2021 22:39:27 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4F9nQR2NFKz93g8; Thu, 1 Apr 2021 10:37:19 +0800 (CST) Received: from huawei.com (10.175.113.32) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Thu, 1 Apr 2021 10:39:17 +0800 From: Shixin Liu To: Vitaly Kuznetsov , "Rafael J. Wysocki" , Len Brown CC: , , Shixin Liu Subject: [PATCH -next] ACPI: processor: Fix a prepocessor warning Date: Thu, 1 Apr 2021 10:39:00 +0800 Message-ID: <20210401023900.3114325-1-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- 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();