3571e53040
patches for easier mirroring, to eliminate a special copy, to make www.freebsd.org/security a full copy of security.freebsd.org and be eventually be the same. For now files are just sitting there. The symlinks are missing. Discussed on: www (repository location) Discussed with: simon (so)
25 lines
838 B
Diff
25 lines
838 B
Diff
Index: sys/amd64/amd64/exception.S
|
|
===================================================================
|
|
RCS file: /home/ncvs/src/sys/amd64/amd64/exception.S,v
|
|
retrieving revision 1.132
|
|
retrieving revision 1.133
|
|
diff -u -d -r1.132 -r1.133
|
|
--- sys/amd64/amd64/exception.S 24 May 2008 06:32:26 -0000 1.132
|
|
+++ sys/amd64/amd64/exception.S 18 Aug 2008 08:47:27 -0000 1.133
|
|
@@ -636,13 +636,10 @@
|
|
.globl doreti_iret_fault
|
|
doreti_iret_fault:
|
|
subq $TF_RIP,%rsp /* space including tf_err, tf_trapno */
|
|
- testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
|
|
- jz 1f /* already running with kernel GS.base */
|
|
- swapgs
|
|
-1: testl $PSL_I,TF_RFLAGS(%rsp)
|
|
- jz 2f
|
|
+ testl $PSL_I,TF_RFLAGS(%rsp)
|
|
+ jz 1f
|
|
sti
|
|
-2: movq %rdi,TF_RDI(%rsp)
|
|
+1: movq %rdi,TF_RDI(%rsp)
|
|
movq %rsi,TF_RSI(%rsp)
|
|
movq %rdx,TF_RDX(%rsp)
|
|
movq %rcx,TF_RCX(%rsp)
|