git: 9e14ac116e70 - main - x86/xen: further PVHv1 removal cleanup

[Roger Pau Monné]

The branch main has been updated by royger:

URL: https://cgit.FreeBSD.org/src/commit/?id=9e14ac116e70722b7fcc803736184535295b165d

commit 9e14ac116e70722b7fcc803736184535295b165d
Author:     Roger Pau Monné <royger at FreeBSD.org>
AuthorDate: 2021-05-18 08:43:19 +0000
Commit:     Roger Pau Monné <royger at FreeBSD.org>
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.