[src/trunk]: src/sys/arch/amd64/amd64 Use FLAT_RING3_CS64 (defined in Xen pub...

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

details:   https://anonhg.NetBSD.org/src/rev/9b16efa8bb2c
branches:  trunk
changeset: 827451:9b16efa8bb2c
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Oct 28 20:57:17 2017 +0000

description:
Use FLAT_RING3_CS64 (defined in Xen public headers) instead of numeric
value.

diffstat:

 sys/arch/amd64/amd64/genassym.cf |  3 ++-
 sys/arch/amd64/amd64/locore.S    |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 9e113fe6d05e -r 9b16efa8bb2c sys/arch/amd64/amd64/genassym.cf
--- a/sys/arch/amd64/amd64/genassym.cf  Sat Oct 28 20:56:51 2017 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf  Sat Oct 28 20:57:17 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.61 2017/07/16 14:02:48 cherry Exp $
+#      $NetBSD: genassym.cf,v 1.62 2017/10/28 20:57:17 bouyer Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -349,6 +349,7 @@
 define XEN_PT_BASE             offsetof(struct start_info, pt_base)    
 define XEN_NR_PT_FRAMES                offsetof(struct start_info, nr_pt_frames)
 define __HYPERVISOR_iret       __HYPERVISOR_iret
+define FLAT_RING3_CS64         FLAT_RING3_CS64
 endif
 
 define NKL4_KIMG_ENTRIES       NKL4_KIMG_ENTRIES
diff -r 9e113fe6d05e -r 9b16efa8bb2c sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Sat Oct 28 20:56:51 2017 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Sat Oct 28 20:57:17 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.139 2017/10/28 20:06:31 maxv Exp $        */
+/*     $NetBSD: locore.S,v 1.140 2017/10/28 20:57:17 bouyer Exp $      */
 
 /*
  * Copyright-o-rama!
@@ -1484,7 +1484,7 @@
        cmpw    $GSEL(GUCODE_SEL, SEL_UPL),TF_CS(%rsp)
        je      .Luexit64
 #ifdef XEN
-       cmpw    $0xe033,TF_CS(%rsp)
+       cmpw    $FLAT_RING3_CS64,TF_CS(%rsp)
        je      .Luexit64
 #endif