Date: Tue, 10 Feb 2009 17:50:03 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r188443 - in stable/7/sys: . amd64/amd64 contrib/pf dev/ath/ath_hal dev/cxgb Message-ID: <200902101750.n1AHo3WQ000176@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Feb 10 17:50:03 2009 New Revision: 188443 URL: http://svn.freebsd.org/changeset/base/188443 Log: MFC r187470: Unconditionally reload fsbase when switching to 32bit binary. Modified: stable/7/sys/ (props changed) stable/7/sys/amd64/amd64/cpu_switch.S stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/amd64/amd64/cpu_switch.S ============================================================================== --- stable/7/sys/amd64/amd64/cpu_switch.S Tue Feb 10 17:47:35 2009 (r188442) +++ stable/7/sys/amd64/amd64/cpu_switch.S Tue Feb 10 17:50:03 2009 (r188443) @@ -199,6 +199,7 @@ done_load_seg: cmpq PCB_FSBASE(%r8),%r9 jz 1f /* Restore userland %fs */ +restore_fsbase: movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx @@ -281,7 +282,7 @@ load_seg: movl PCB_DS(%r8),%ds movl PCB_ES(%r8),%es movl PCB_FS(%r8),%fs - jmp done_load_seg + jmp restore_fsbase /* Restore userland %gs while preserving kernel gsbase */ 2: movq PCPU(GS32P),%rax movq PCB_GS32SD(%r8),%rcx
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902101750.n1AHo3WQ000176>