svn commit: r286308 - in stable/10/sys/amd64: amd64 include linux32

[Konstantin Belousov]

Author: kib
Date: Wed Aug  5 07:35:34 2015
New Revision: 286308
URL: https://svnweb.freebsd.org/changeset/base/286308

Log:
  MFC r284921:
  pcb_gs32sd is unused for long time, remove it.  Keep the padding in pcb.

Modified:
  stable/10/sys/amd64/amd64/genassym.c
  stable/10/sys/amd64/include/pcb.h
  stable/10/sys/amd64/linux32/linux32_machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/amd64/genassym.c
==============================================================================
--- stable/10/sys/amd64/amd64/genassym.c	Wed Aug  5 07:34:29 2015	(r286307)
+++ stable/10/sys/amd64/amd64/genassym.c	Wed Aug  5 07:35:34 2015	(r286308)
@@ -153,7 +153,6 @@ ASSYM(PCB_LDT, offsetof(struct pcb, pcb_
 ASSYM(PCB_TR, offsetof(struct pcb, pcb_tr));
 ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags));
 ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault));
-ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd));
 ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp));
 ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save));
 ASSYM(PCB_EFER, offsetof(struct pcb, pcb_efer));

Modified: stable/10/sys/amd64/include/pcb.h
==============================================================================
--- stable/10/sys/amd64/include/pcb.h	Wed Aug  5 07:34:29 2015	(r286307)
+++ stable/10/sys/amd64/include/pcb.h	Wed Aug  5 07:35:34 2015	(r286308)
@@ -85,8 +85,7 @@ struct pcb {
 	/* copyin/out fault recovery */
 	caddr_t		pcb_onfault;
 
-	/* 32-bit segment descriptor */
-	struct user_segment_descriptor pcb_gs32sd;
+	uint64_t	pcb_pad0;
 
 	/* local tss, with i/o bitmap; NULL for common */
 	struct amd64tss *pcb_tssp;

Modified: stable/10/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_machdep.c	Wed Aug  5 07:34:29 2015	(r286307)
+++ stable/10/sys/amd64/linux32/linux32_machdep.c	Wed Aug  5 07:35:34 2015	(r286308)
@@ -453,7 +453,6 @@ linux_set_cloned_tls(struct thread *td, 
 #endif
 		pcb = td->td_pcb;
 		pcb->pcb_gsbase = (register_t)info.base_addr;
-/* XXXKIB	pcb->pcb_gs32sd = sd; */
 		td->td_frame->tf_gs = GSEL(GUGS32_SEL, SEL_UPL);
 		set_pcb_flags(pcb, PCB_32BIT);
 	}