From owner-dev-commits-src-all@freebsd.org Tue May 18 08:44:56 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20FCE64534B; Tue, 18 May 2021 08:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FkqLw0C6Fz4Txb; Tue, 18 May 2021 08:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E38971C4D2; Tue, 18 May 2021 08:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14I8it8p071664; Tue, 18 May 2021 08:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14I8it5X071663; Tue, 18 May 2021 08:44:55 GMT (envelope-from git) Date: Tue, 18 May 2021 08:44:55 GMT Message-Id: <202105180844.14I8it5X071663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= Subject: git: 9e14ac116e70 - main - x86/xen: further PVHv1 removal cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e14ac116e70722b7fcc803736184535295b165d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 08:44:56 -0000 The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=9e14ac116e70722b7fcc803736184535295b165d commit 9e14ac116e70722b7fcc803736184535295b165d Author: Roger Pau Monné AuthorDate: 2021-05-18 08:43:19 +0000 Commit: Roger Pau Monné CommitDate: 2021-05-18 08:43:31 +0000 x86/xen: further PVHv1 removal cleanup The AP startup extern variable declarations are not longer needed, since PVHv2 uses the native AP startup path using the lapic. Remove the declaration and make the variables static to mp_machdep.c Sponsored by: Citrix Systems R&D --- sys/amd64/amd64/mp_machdep.c | 8 ++++---- sys/x86/xen/pv.c | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 6f788c087f06..1513393a4387 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -99,10 +99,10 @@ __FBSDID("$FreeBSD$"); #define AP_BOOTPT_SZ (PAGE_SIZE * 4) /* Temporary variables for init_secondary() */ -char *doublefault_stack; -char *mce_stack; -char *nmi_stack; -char *dbg_stack; +static char *doublefault_stack; +static char *mce_stack; +static char *nmi_stack; +static char *dbg_stack; extern u_int mptramp_la57; diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 254ca4002bda..6e1bba691171 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -96,14 +96,6 @@ static caddr_t xen_pvh_parse_preload_data(uint64_t); static void xen_pvh_parse_memmap(caddr_t, vm_paddr_t *, int *); /*---------------------------- Extern Declarations ---------------------------*/ -#ifdef SMP -/* Variables used by amd64 mp_machdep to start APs */ -extern char *doublefault_stack; -extern char *mce_stack; -extern char *nmi_stack; -extern char *dbg_stack; -#endif - /* * Placed by the linker at the end of the bss section, which is the last * section loaded by Xen before loading the symtab and strtab.