Module Name: src
Committed By: maxv
Date: Sat Dec 17 13:49:05 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: locore.S
Log Message:
Fix the name of the labels. I think I got confused by jne, so while here
replace it by jnz, which is more explicit.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/amd64/amd64/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.117 src/sys/arch/amd64/amd64/locore.S:1.118
--- src/sys/arch/amd64/amd64/locore.S:1.117 Fri Dec 16 19:52:22 2016
+++ src/sys/arch/amd64/amd64/locore.S Sat Dec 17 13:49:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.117 2016/12/16 19:52:22 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.118 2016/12/17 13:49:05 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -1141,9 +1141,9 @@ skip_CR0:
/* The 32bit LWPs are handled differently. */
testl $PCB_COMPAT32,PCB_FLAGS(%r14)
- jne lwp_64bit
+ jnz lwp_32bit
-lwp_32bit:
+lwp_64bit:
/* Zero out %fs/%gs registers. */
xorq %rax,%rax
movw %ax,%fs
@@ -1170,7 +1170,7 @@ lwp_32bit:
jmp switch_return
-lwp_64bit:
+lwp_32bit:
/* Reload %fs/%gs GDT descriptors. */
movq CPUVAR(GDT),%rcx
movq PCB_FS(%r14),%rax
