From patchwork Fri Aug 19 07:53:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9289751 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 91D9B600CB for ; Fri, 19 Aug 2016 07:55:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 856D82930E for ; Fri, 19 Aug 2016 07:55:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A3EC2932E; Fri, 19 Aug 2016 07:55:40 +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 ED53F2930E for ; Fri, 19 Aug 2016 07:55:39 +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 1baecS-0005xS-9X; Fri, 19 Aug 2016 07:53:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1baecR-0005xI-Ph for xen-devel@lists.xenproject.org; Fri, 19 Aug 2016 07:53:35 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 2E/C4-11394-EFAB6B75; Fri, 19 Aug 2016 07:53:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRWlGSWpSXmKPExsXS6fjDS/ffrm3 hBu+3clp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnHdn5lLpgrUzHnemYDY69EFyMnh5BAnsTN 6fPZQGxeATuJo1d2sILYEgKGEk/fXweLswioSqy5dQPMZhNQl2h7th2ohoNDRMBA4tzRJBCTW UBfYts6FpAKYQEnibd777CBhHkFBCX+7hAGCTMDDZ945jL7BEauWQiZWUgyELaWxMNft1ggbG 2JZQtfM88Cmy8tsfwfB0TYVuLu5+/smEo8JN59F17AyLGKUb04tagstUjXWC+pKDM9oyQ3MTN H19DAWC83tbg4MT01JzGpWC85P3cTIzDoGIBgB2PzF6dDjJIcTEqivL/0t4UL8SXlp1RmJBZn xBeV5qQWH2KU4eBQkuD9uhMoJ1iUmp5akZaZAwx/mLQEB4+SCO8lkDRvcUFibnFmOkTqFKOil DivJTBqhARAEhmleXBtsJi7xCgrJczLCHSIEE9BalFuZgmq/CtGcQ5GJWHexyDjeTLzSuCmvw JazAS0mJd/C8jikkSElFQD4/Heo1G2Tx3kjgm9mLrq9vWrfVJXOzbnhijrrPctdFrk5sAp+CF FOHjrpk8Tp5jmrF5hyfXO3eLelVU7OPwjWNk2HjrkOv0ve33NYo/79kvnTD6Vfn/Xhfev/H6c XPr4ReHMXUlf98856H8x+86UtA+ifXE7L11qX3C14lpqo+D9c65u8qFyx28rsRRnJBpqMRcVJ wIAiUB0nbQCAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1471593212!48820432!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20519 invoked from network); 19 Aug 2016 07:53:33 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-7.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Aug 2016 07:53:33 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Fri, 19 Aug 2016 01:53:31 -0600 Message-Id: <57B6D71C0200007800107486@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Fri, 19 Aug 2016 01:53:32 -0600 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH] x86: don't needlessly globalize page table labels 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Neither l1_identmap[] nor l3_identmap[] get referenced from outside their defining source file; the latter didn't even have an extern declaration for use from C sources. Signed-off-by: Jan Beulich x86: don't needlessly globalize page table labels Neither l1_identmap[] nor l3_identmap[] get referenced from outside their defining source file; the latter didn't even have an extern declaration for use from C sources. Signed-off-by: Jan Beulich --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -88,7 +88,7 @@ GLOBAL(__page_tables_start) * of physical memory. In any case the VGA hole should be mapped with type UC. * Uses 1x 4k page. */ -GLOBAL(l1_identmap) +l1_identmap: pfn = 0 .rept L1_PAGETABLE_ENTRIES /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ @@ -143,7 +143,7 @@ l2_fixmap: .size l2_fixmap, . - l2_fixmap /* Identity map, covering the 4 l2_identmap tables. Uses 1x 4k page. */ -GLOBAL(l3_identmap) +l3_identmap: idx = 0 .rept 4 .quad sym_phys(l2_identmap) + (idx << PAGE_SHIFT) + __PAGE_HYPERVISOR --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -291,8 +291,7 @@ extern l2_pgentry_t l2_xenmap[L2_PAGETAB l2_bootmap[L2_PAGETABLE_ENTRIES]; extern l3_pgentry_t l3_bootmap[L3_PAGETABLE_ENTRIES]; extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; -extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], - l1_fixmap[L1_PAGETABLE_ENTRIES]; +extern l1_pgentry_t l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */ Reviewed-by: Andrew Cooper --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -88,7 +88,7 @@ GLOBAL(__page_tables_start) * of physical memory. In any case the VGA hole should be mapped with type UC. * Uses 1x 4k page. */ -GLOBAL(l1_identmap) +l1_identmap: pfn = 0 .rept L1_PAGETABLE_ENTRIES /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ @@ -143,7 +143,7 @@ l2_fixmap: .size l2_fixmap, . - l2_fixmap /* Identity map, covering the 4 l2_identmap tables. Uses 1x 4k page. */ -GLOBAL(l3_identmap) +l3_identmap: idx = 0 .rept 4 .quad sym_phys(l2_identmap) + (idx << PAGE_SHIFT) + __PAGE_HYPERVISOR --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -291,8 +291,7 @@ extern l2_pgentry_t l2_xenmap[L2_PAGETAB l2_bootmap[L2_PAGETABLE_ENTRIES]; extern l3_pgentry_t l3_bootmap[L3_PAGETABLE_ENTRIES]; extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; -extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], - l1_fixmap[L1_PAGETABLE_ENTRIES]; +extern l1_pgentry_t l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */