[src/trunk]: src/sys/arch/amd64/amd64 Ah, remove duplicate SVS_LEAVE. Fixes 3...

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

details:   https://anonhg.NetBSD.org/src/rev/124a0a1abe72
branches:  trunk
changeset: 829207:124a0a1abe72
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Jan 22 08:14:09 2018 +0000

description:
Ah, remove duplicate SVS_LEAVE. Fixes 32bit binaries. While here remove
duplicate 'cli', but that's harmless.

diffstat:

 sys/arch/amd64/amd64/locore.S |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r ee019d156a05 -r 124a0a1abe72 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Mon Jan 22 07:22:52 2018 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Mon Jan 22 08:14:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.148 2018/01/21 11:21:40 maxv Exp $        */
+/*     $NetBSD: locore.S,v 1.149 2018/01/22 08:14:09 maxv Exp $        */
 
 /*
  * Copyright-o-rama!
@@ -1534,14 +1534,12 @@
 #endif
 
 .Luexit32:
-       NOT_XEN(cli;)
 do_mov_es:
        movw    TF_ES(%rsp),%es
 do_mov_ds:
        movw    TF_DS(%rsp),%ds
 do_mov_fs:
        movw    TF_FS(%rsp),%fs
-       SVS_LEAVE
        SWAPGS
 #ifndef XEN
 do_mov_gs:
@@ -1550,7 +1548,6 @@
        jmp     .Lkexit
 
 .Luexit64:
-       NOT_XEN(cli;)
        SWAPGS
 
 .Lkexit: