svn commit: r354592 - in head/sys/amd64: amd64 include

[Konstantin Belousov]

Author: kib
Date: Sun Nov 10 10:03:22 2019
New Revision: 354592
URL: https://svnweb.freebsd.org/changeset/base/354592

Log:
  amd64: change r_gdt to the local variable in hammer_time().
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/machdep.c
  head/sys/amd64/include/segments.h

Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c	Sun Nov 10 09:41:29 2019	(r354591)
+++ head/sys/amd64/amd64/machdep.c	Sun Nov 10 10:03:22 2019	(r354592)
@@ -213,7 +213,7 @@ long realmem = 0;
 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;
@@ -1609,6 +1609,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: head/sys/amd64/include/segments.h
==============================================================================
--- head/sys/amd64/include/segments.h	Sun Nov 10 09:41:29 2019	(r354591)
+++ head/sys/amd64/include/segments.h	Sun Nov 10 10:03:22 2019	(r354592)
@@ -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,