svn commit: r354809 - in stable/12/sys/amd64: amd64 include

[Konstantin Belousov]

Author: kib
Date: Mon Nov 18 13:34:27 2019
New Revision: 354809
URL: https://svnweb.freebsd.org/changeset/base/354809

Log:
  MFC r354592:
  amd64: change r_gdt to the local variable in hammer_time().

Modified:
  stable/12/sys/amd64/amd64/machdep.c
  stable/12/sys/amd64/include/segments.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/12/sys/amd64/amd64/machdep.c	Mon Nov 18 13:31:16 2019	(r354808)
+++ stable/12/sys/amd64/amd64/machdep.c	Mon Nov 18 13:34:27 2019	(r354809)
@@ -228,7 +228,7 @@ vm_paddr_t dump_avail[PHYSMAP_SIZE + 2];
 struct kva_md_info kmi;
 
 static struct trapframe proc0_tf;
-struct region_descriptor r_gdt, r_idt;
+struct region_descriptor r_idt;
 
 struct pcpu *__pcpu;
 struct pcpu temp_bsp_pcpu;
@@ -1625,6 +1625,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
 	struct xstate_hdr *xhdr;
 	u_int64_t rsp0;
 	char *env;
+	struct region_descriptor r_gdt;
 	size_t kstack0_sz;
 	int late_console;
 

Modified: stable/12/sys/amd64/include/segments.h
==============================================================================
--- stable/12/sys/amd64/include/segments.h	Mon Nov 18 13:31:16 2019	(r354808)
+++ stable/12/sys/amd64/include/segments.h	Mon Nov 18 13:34:27 2019	(r354809)
@@ -92,7 +92,7 @@ struct region_descriptor {
 extern struct user_segment_descriptor gdt[];
 extern struct soft_segment_descriptor gdt_segs[];
 extern struct gate_descriptor *idt;
-extern struct region_descriptor r_gdt, r_idt;
+extern struct region_descriptor r_idt;
 
 void	lgdt(struct region_descriptor *rdp);
 void	sdtossd(struct user_segment_descriptor *sdp,