[src/trunk]: src/sys/arch/amd64/amd64 Protect the SVS part of SYSCALL_ENTRY b...

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

details:   https://anonhg.NetBSD.org/src/rev/b6e752b50e39
branches:  trunk
changeset: 830028:b6e752b50e39
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 22 14:08:48 2018 +0000

description:
Protect the SVS part of SYSCALL_ENTRY by #ifdef SVS to make non-SVS
kernels compile again.

diffstat:

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

diffs (35 lines):

diff -r 09ad2a70268a -r b6e752b50e39 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Thu Feb 22 13:27:17 2018 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Thu Feb 22 14:08:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.153 2018/02/22 10:42:10 maxv Exp $        */
+/*     $NetBSD: locore.S,v 1.154 2018/02/22 14:08:48 martin Exp $      */
 
 /*
  * Copyright-o-rama!
@@ -1378,6 +1378,7 @@
 
 #define SP(x,reg)      (x)-(TF_SS+8)(reg)
 
+#ifdef SVS
        .if     \is_svs
                movq    %rax,SVS_UTLS+UTLS_SCRATCH
                movq    SVS_UTLS+UTLS_RSP0,%rax
@@ -1392,6 +1393,7 @@
 
                movq    SVS_UTLS+UTLS_SCRATCH,%rax
        .else
+#endif
                movq    %r15,CPUVAR(SCRATCH)
                movq    CPUVAR(CURLWP),%r15
                movq    L_PCB(%r15),%r15
@@ -1406,7 +1408,9 @@
                leaq    SP(0,%r15),%rsp                 /* %rsp now valid after frame */
 
                movq    CPUVAR(SCRATCH),%r15
+#ifdef SVS
        .endif
+#endif
 
 #undef SP