From patchwork Wed Apr 3 18:56:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 10884347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 84ECA17E9 for ; Wed, 3 Apr 2019 18:58:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70AF0288BA for ; Wed, 3 Apr 2019 18:58:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 653092890F; Wed, 3 Apr 2019 18:58:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E838928A05 for ; Wed, 3 Apr 2019 18:58:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hBl3g-0001rd-5f; Wed, 03 Apr 2019 18:56:24 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hBl3f-0001rY-Lk for xen-devel@lists.xen.org; Wed, 03 Apr 2019 18:56:23 +0000 X-Inumbo-ID: 2c19c99c-5642-11e9-bc90-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 2c19c99c-5642-11e9-bc90-bc764e045a96; Wed, 03 Apr 2019 18:56:22 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,305,1549929600"; d="scan'208";a="82654414" From: Andrew Cooper To: Xen-devel Date: Wed, 3 Apr 2019 19:56:18 +0100 Message-ID: <1554317778-17602-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/pv: Drop redundant CONFIG_PV ifdefary X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP These were made redundant by c/s 23058e7b3 "x86/shadow: put PV L1TF functions under CONFIG_PV" but makes the code read as if outside of the ifdef. Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Acked-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné --- xen/include/asm-x86/shadow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 0d9f663..2690584 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -237,7 +237,7 @@ static inline void pv_l1tf_domain_init(struct domain *d) d->arch.pv.check_l1tf = is_hardware_domain(d) ? opt_pv_l1tf_hwdom : opt_pv_l1tf_domu; -#if defined(CONFIG_SHADOW_PAGING) && defined(CONFIG_PV) +#if defined(CONFIG_SHADOW_PAGING) tasklet_init(&d->arch.paging.shadow.pv_l1tf_tasklet, pv_l1tf_tasklet, (unsigned long)d); #endif @@ -245,7 +245,7 @@ static inline void pv_l1tf_domain_init(struct domain *d) static inline void pv_l1tf_domain_destroy(struct domain *d) { -#if defined(CONFIG_SHADOW_PAGING) && defined(CONFIG_PV) +#if defined(CONFIG_SHADOW_PAGING) tasklet_kill(&d->arch.paging.shadow.pv_l1tf_tasklet); #endif }