diff options
| author | jkim <jkim@FreeBSD.org> | 2010-12-22 19:57:03 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-12-22 19:57:03 +0000 |
| commit | 940b86ebdccd1f22427e953eccea0f4bc2f5ba06 (patch) | |
| tree | a4072fdeb9467dee9b67632d7ebb90b7c6c1c161 /sys/amd64/amd64/exception.S | |
| parent | 0826d29a2d8e53cc3f8de837cc3646c464f5cd20 (diff) | |
| download | FreeBSD-src-940b86ebdccd1f22427e953eccea0f4bc2f5ba06.zip FreeBSD-src-940b86ebdccd1f22427e953eccea0f4bc2f5ba06.tar.gz | |
Increase size of pcb_flags to four bytes.
Requested by: bde, jhb
Diffstat (limited to 'sys/amd64/amd64/exception.S')
| -rw-r--r-- | sys/amd64/amd64/exception.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 2d6f97a..f2339f8 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -170,7 +170,7 @@ alltraps: jz alltraps_testi /* already running with kernel GS.base */ swapgs movq PCPU(CURPCB),%rdi - andb $~PCB_FULL_IRET,PCB_FLAGS(%rdi) + andl $~PCB_FULL_IRET,PCB_FLAGS(%rdi) movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) @@ -243,7 +243,7 @@ alltraps_noen: jz 1f /* already running with kernel GS.base */ swapgs movq PCPU(CURPCB),%rdi - andb $~PCB_FULL_IRET,PCB_FLAGS(%rdi) + andl $~PCB_FULL_IRET,PCB_FLAGS(%rdi) 1: movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) @@ -294,7 +294,7 @@ IDTVEC(page) jz 1f /* already running with kernel GS.base */ swapgs movq PCPU(CURPCB),%rdi - andb $~PCB_FULL_IRET,PCB_FLAGS(%rdi) + andl $~PCB_FULL_IRET,PCB_FLAGS(%rdi) 1: movq %cr2,%rdi /* preserve %cr2 before .. */ movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */ movw %fs,TF_FS(%rsp) @@ -324,7 +324,7 @@ IDTVEC(prot) jz 2f /* already running with kernel GS.base */ 1: swapgs 2: movq PCPU(CURPCB),%rdi - orb $PCB_FULL_IRET,PCB_FLAGS(%rdi) /* always full iret from GPF */ + orl $PCB_FULL_IRET,PCB_FLAGS(%rdi) /* always full iret from GPF */ movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) @@ -356,7 +356,7 @@ IDTVEC(fast_syscall) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) movq PCPU(CURPCB),%r11 - andb $~PCB_FULL_IRET,PCB_FLAGS(%r11) + andl $~PCB_FULL_IRET,PCB_FLAGS(%r11) sti movq $KUDSEL,TF_SS(%rsp) movq $KUCSEL,TF_CS(%rsp) @@ -661,7 +661,7 @@ doreti_exit: */ testb $SEL_RPL_MASK,TF_CS(%rsp) jz ld_regs - testb $PCB_FULL_IRET,PCB_FLAGS(%r8) + testl $PCB_FULL_IRET,PCB_FLAGS(%r8) jz ld_regs testl $TF_HASSEGS,TF_FLAGS(%rsp) je set_segs |
