Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/compat/linux32/arch/amd64/linux32_machdep.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/linux32/arch/amd64/linux32_machdep.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.27
retrieving revision 1.27.4.2
diff -u -p -r1.27 -r1.27.4.2
--- src/sys/compat/linux32/arch/amd64/linux32_machdep.c	2010/11/02 18:14:06	1.27
+++ src/sys/compat/linux32/arch/amd64/linux32_machdep.c	2011/03/05 15:10:14	1.27.4.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_machdep.c,v 1.27 2010/11/02 18:14:06 chs Exp $ */
+/*	$NetBSD: linux32_machdep.c,v 1.27.4.2 2011/03/05 15:10:14 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.27 2010/11/02 18:14:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.27.4.2 2011/03/05 15:10:14 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -296,7 +296,7 @@ linux32_setregs(struct lwp *l, struct ex
 
 	tf = l->l_md.md_regs;
 	tf->tf_rax = 0;
-	tf->tf_rbx = (u_int64_t)p->p_psstr & 0xffffffff;
+	tf->tf_rbx = (u_int32_t)p->p_psstrp;
 	tf->tf_rcx = pack->ep_entry & 0xffffffff;
 	tf->tf_rdx = 0;
 	tf->tf_rsi = 0;
@@ -433,11 +433,11 @@ linux32_restore_sigcontext(struct lwp *l
 		return EINVAL;
 
 	if (scp->sc_fs != 0 && !VALID_USER_DSEL32(scp->sc_fs) &&
-	    !(scp->sc_fs == GSEL(GUFS_SEL, SEL_UPL) && pcb->pcb_fs != 0))
+	    !(VALID_USER_FSEL32(scp->sc_fs) && pcb->pcb_fs != 0))
 		return EINVAL;
 
 	if (scp->sc_gs != 0 && !VALID_USER_DSEL32(scp->sc_gs) &&
-	    !(scp->sc_gs == GSEL(GUGS_SEL, SEL_UPL) && pcb->pcb_gs != 0))
+	    !(VALID_USER_GSEL32(scp->sc_gs) && pcb->pcb_gs != 0))
 		return EINVAL;
 
 	if (scp->sc_es != 0 && !VALID_USER_DSEL32(scp->sc_es))