svn commit: r231866 - stable/9/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Fri Feb 17 10:37:14 2012
New Revision: 231866
URL: http://svn.freebsd.org/changeset/base/231866

Log:
  MFC r231441:
  In cpu_set_user_tls(), consistently set PCB_FULL_IRET pcb flag for
  both 64bit and 32bit binaries, not for 64bit only.

Modified:
  stable/9/sys/amd64/amd64/vm_machdep.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- stable/9/sys/amd64/amd64/vm_machdep.c	Fri Feb 17 10:27:58 2012	(r231865)
+++ stable/9/sys/amd64/amd64/vm_machdep.c	Fri Feb 17 10:37:14 2012	(r231866)
@@ -498,6 +498,7 @@ cpu_set_user_tls(struct thread *td, void
 		return (EINVAL);
 
 	pcb = td->td_pcb;
+	set_pcb_flags(pcb, PCB_FULL_IRET);
 #ifdef COMPAT_FREEBSD32
 	if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
 		pcb->pcb_gsbase = (register_t)tls_base;
@@ -505,7 +506,6 @@ cpu_set_user_tls(struct thread *td, void
 	}
 #endif
 	pcb->pcb_fsbase = (register_t)tls_base;
-	set_pcb_flags(pcb, PCB_FULL_IRET);
 	return (0);
 }