[src/trunk]: src/sys/arch Back out the cpu_switchto() workaround now that it'...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3336aaf8d551
branches:  trunk
changeset: 968414:3336aaf8d551
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Jan 15 18:47:23 2020 +0000

description:
Back out the cpu_switchto() workaround now that it's no longer needed.

diffstat:

 sys/arch/amd64/amd64/locore.S |  6 +-----
 sys/arch/i386/i386/locore.S   |  8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r f931282efd0b -r 3336aaf8d551 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Wed Jan 15 18:45:57 2020 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Wed Jan 15 18:47:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.199 2020/01/13 11:40:15 ad Exp $  */
+/*     $NetBSD: locore.S,v 1.200 2020/01/15 18:47:23 ad Exp $  */
 
 /*
  * Copyright-o-rama!
@@ -1079,14 +1079,10 @@
        movq    %rdi,%r13       /* oldlwp */
        movq    %rsi,%r12       /* newlwp */
 
-       testq   %r13,%r13       /* oldlwp = NULL ? */
-       jz      .Lskip_save
-
        /* Save old context. */
        movq    L_PCB(%r13),%rax
        movq    %rsp,PCB_RSP(%rax)
        movq    %rbp,PCB_RBP(%rax)
-.Lskip_save:
 
        /* Switch to newlwp's stack. */
        movq    L_PCB(%r12),%r14
diff -r f931282efd0b -r 3336aaf8d551 sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Wed Jan 15 18:45:57 2020 +0000
+++ b/sys/arch/i386/i386/locore.S       Wed Jan 15 18:47:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.176 2020/01/13 12:03:41 ad Exp $  */
+/*     $NetBSD: locore.S,v 1.177 2020/01/15 18:47:23 ad Exp $  */
 
 /*
  * Copyright-o-rama!
@@ -128,7 +128,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.176 2020/01/13 12:03:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.177 2020/01/15 18:47:23 ad Exp $");
 
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
@@ -1316,14 +1316,10 @@
        movl    20(%esp),%edi           /* newlwp */
        movl    24(%esp),%edx           /* returning */
 
-       testl   %esi,%esi               /* oldlwp = NULL ? */
-       jz      skip_save
-
        /* Save old context. */
        movl    L_PCB(%esi),%eax
        movl    %esp,PCB_ESP(%eax)
        movl    %ebp,PCB_EBP(%eax)
-skip_save:
 
        /* Switch to newlwp's stack. */
        movl    L_PCB(%edi),%ebx