From patchwork Thu Mar 2 17:53:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 9601237 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 7499260453 for ; Thu, 2 Mar 2017 17:56:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67F1D285CC for ; Thu, 2 Mar 2017 17:56:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CD14285CF; Thu, 2 Mar 2017 17:56:07 +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 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 1F2DB285CC for ; Thu, 2 Mar 2017 17:56:07 +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 1cjUvw-0003qC-7Z; Thu, 02 Mar 2017 17:54:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjUvv-0003iN-CV for xen-devel@lists.xenproject.org; Thu, 02 Mar 2017 17:54:31 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id A2/F1-19731-75C58B85; Thu, 02 Mar 2017 17:54:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsVysWW7jG5YzI4 Ig32HlC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxvs08xFxzkqOi/sZ+tgXExexcjF4eQwG4m iY07tkI5hxkl7tybyNzFyMnBJqAj8f3pKTBbREBJ4t6qyUwgRcwCmxglHrSeZgdJCAu4SjRdW sICYrMIqErs//KYFcTmFbCQaN7wjQnE5gSyb066zAhiCwmYS0y6MgOsRkJAW+Jswy+wzRICfY wSj5cfYJrAyLOAkWEVo3pxalFZapGuoV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJSsV5yfu4 mRqDvGYBgB+PO506HGCU5mJREeY+b7ogQ4kvKT6nMSCzOiC8qzUktPsQow8GhJMHLGASUEyxK TU+tSMvMAQYhTFqCg0dJhPdgIFCat7ggMbc4Mx0idYpRUUqcdzVIQgAkkVGaB9cGC/xLjLJSw ryMQIcI8RSkFuVmlqDKv2IU52BUEua9CjKFJzOvBG76K6DFTECLX6hsBVlckoiQkmpglOz9V9 4uY3v40UKWDWut4tXbrm++3rhold7iLp/W7h/XKrd9v/fo1MVvb1Z12E5YE6L8X+NgWZFSU6n CNfdXm2QXbL5klvb/ko5cGdPbWIe5nPyM9/d9THJ/UpJQ3tA2rdMmedPbLCHl0v45LXf3HT2u Vpo6/ddDvkv/rp3uNTojxiH2693HFUosxRmJhlrMRcWJAIJLwkZ3AgAA X-Env-Sender: vkuznets@redhat.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1488477269!80276977!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTQwNjQ=\n X-StarScan-Received: X-StarScan-Version: 9.4.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12654 invoked from network); 2 Mar 2017 17:54:30 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-13.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 2 Mar 2017 17:54:30 -0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC93161B8A; Thu, 2 Mar 2017 17:54:29 +0000 (UTC) Received: from vitty.brq.redhat.com (vitty.brq.redhat.com [10.34.26.3]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v22HrwkC010760; Thu, 2 Mar 2017 12:54:28 -0500 From: Vitaly Kuznetsov To: xen-devel@lists.xenproject.org Date: Thu, 2 Mar 2017 18:53:52 +0100 Message-Id: <20170302175357.8222-17-vkuznets@redhat.com> In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 02 Mar 2017 17:54:30 +0000 (UTC) Cc: Juergen Gross , Boris Ostrovsky , x86@kernel.org, Andrew Jones , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH v2 16/21] x86/xen: define startup_xen for XEN PV only 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 startup_xen references PV-only code, decorate it with #ifdef CONFIG_XEN_PV to make PV-free builds possible. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Juergen Gross --- arch/x86/xen/xen-head.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 37794e4..72a8e6a 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -16,6 +16,7 @@ #include #include +#ifdef CONFIG_XEN_PV __INIT ENTRY(startup_xen) cld @@ -34,6 +35,7 @@ ENTRY(startup_xen) jmp xen_start_kernel __FINIT +#endif .pushsection .text .balign PAGE_SIZE @@ -58,7 +60,9 @@ ENTRY(hypercall_page) /* Map the p2m table to a 512GB-aligned user address. */ ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad PGDIR_SIZE) #endif +#ifdef CONFIG_XEN_PV ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen) +#endif ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page) ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii "!writable_page_tables|pae_pgdir_above_4gb")