From patchwork Tue May 2 17:23:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9708413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2485B60385 for ; Tue, 2 May 2017 17:26:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14C50204C2 for ; Tue, 2 May 2017 17:26:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0959C284E3; Tue, 2 May 2017 17:26:35 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A7A42204C2 for ; Tue, 2 May 2017 17:26:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5bWy-00056C-Lb; Tue, 02 May 2017 17:24:08 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5bWx-000566-NP for xen-devel@lists.xenproject.org; Tue, 02 May 2017 17:24:07 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id A9/E5-03587-7B0C8095; Tue, 02 May 2017 17:24:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKLMWRWlGSWpSXmKPExsXSO6nOVXfbAY5 Ig/s7lCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ox/06czFczgrjh9az97A+Nbzi5GLg4hgXYm iV1PN7FCOF8ZJaZd3scC4WxglLjc8osNwtnNKNHytJGxi5GTg03ASOLs0elgtoiAsMTxo9uYQ YqYBXoZJbra2sESwgK+EjN3drKB2CwCqhIdexeB2bwCXhIdPw6xgtgSAnISN891MkPYxhJ9s/ pYJjDyLGBkWMWoXpxaVJZapGusl1SUmZ5RkpuYmaNraGCml5taXJyYnpqTmFSsl5yfu4kR6H0 GINjB2PHP6RCjJAeTkiiv+iv2SCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvHL7OSKFBItS01Mr 0jJzgGEIk5bg4FES4Y3aB5TmLS5IzC3OTIdInWJUlBLntQXpEwBJZJTmwbXBQv8So6yUMC8j0 CFCPAWpRbmZJajyrxjFORiVhHmXg0zhycwrgZv+CmgxE9DiZlmwxSWJCCmpBsaab3LHSwVy3c 4lu9QtXJu94+auwiTXotrjKuGv2F6+F6vkr2B+fdr6qs2Z3I5VefafDJj1Nji6a+ZkqtsUxon lSGSmXLV93i7Kky+pY3HMe9E8j22Kv18t/3x43dF7Z2e4sLWKnDZ51LX/z4VJZ3bfuGm6mv3T 9XU2qtlbX81pXt725kENe4wSS3FGoqEWc1FxIgDmyQ04eAIAAA== X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1493745844!47169137!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52667 invoked from network); 2 May 2017 17:24:06 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 2 May 2017 17:24:06 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v42HNadb015061 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 2 May 2017 17:23:37 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v42HNaKf007029 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 2 May 2017 17:23:36 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v42HNZba024269; Tue, 2 May 2017 17:23:36 GMT Received: from dhcp-burlington7-2nd-B-east-10-152-55-162.usdhcp.oraclecorp.com.com (/10.152.52.138) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 02 May 2017 10:23:35 -0700 From: Boris Ostrovsky To: jgross@suse.com Date: Tue, 2 May 2017 13:23:06 -0400 Message-Id: <1493745786-27350-1-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: xen-devel@lists.xenproject.org, Boris Ostrovsky , rdunlap@infradead.org, linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH] xen: Move xen_have_vector_callback definition to enlighten.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 84d582d236dc ("xen: Revert commits da72ff5bfcb0 and 72a9b186292d") defined xen_have_vector_callback in enlighten_hvm.c. Since guest-type-neutral code refers to this variable this causes build failures when CONFIG_XEN_PVHVM is not defined. Moving xen_have_vector_callback definition to enlighten.c resolves this issue. Signed-off-by: Boris Ostrovsky Reported-by: Randy Dunlap Acked-by: Randy Dunlap Reviewed-by: Juergen Gross --- arch/x86/xen/enlighten.c | 3 +++ arch/x86/xen/enlighten_hvm.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 41d324c..a5ffcbb 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -57,6 +57,9 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; +__read_mostly int xen_have_vector_callback; +EXPORT_SYMBOL_GPL(xen_have_vector_callback); + /* * Point at some empty memory to start with. We map the real shared_info * page as soon as fixmap is up and running. diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c index 078c512..a6d014f 100644 --- a/arch/x86/xen/enlighten_hvm.c +++ b/arch/x86/xen/enlighten_hvm.c @@ -18,9 +18,6 @@ #include "mmu.h" #include "smp.h" -__read_mostly int xen_have_vector_callback; -EXPORT_SYMBOL_GPL(xen_have_vector_callback); - void __ref xen_hvm_init_shared_info(void) { int cpu;