Module Name: src
Committed By: bouyer
Date: Sat Oct 28 20:57:17 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf locore.S
Log Message:
Use FLAT_RING3_CS64 (defined in Xen public headers) instead of numeric
value.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.139 -r1.140 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/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.61 src/sys/arch/amd64/amd64/genassym.cf:1.62
--- src/sys/arch/amd64/amd64/genassym.cf:1.61 Sun Jul 16 14:02:48 2017
+++ src/sys/arch/amd64/amd64/genassym.cf Sat Oct 28 20:57:17 2017
@@ -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 EVTCHN_UPCALL_MASK offsetof(struc
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
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.139 src/sys/arch/amd64/amd64/locore.S:1.140
--- src/sys/arch/amd64/amd64/locore.S:1.139 Sat Oct 28 20:06:31 2017
+++ src/sys/arch/amd64/amd64/locore.S Sat Oct 28 20:57:17 2017
@@ -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 @@ ENTRY(intrfastexit)
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
