Module Name: src
Committed By: maxv
Date: Sun Aug 12 06:11:47 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: amd64_trap.S genassym.cf
Log Message:
Eliminate the only ASM reference to VM_MIN_KERNEL_ADDRESS. Rename the
value to VM_SPACE_SEP_HIGH32, it is now the highest 32bits of the first
va of the higher half of the address space (right after the canonical
hole).
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/amd64/amd64_trap.S
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amd64/amd64/genassym.cf
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/amd64_trap.S
diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.44 src/sys/arch/amd64/amd64/amd64_trap.S:1.45
--- src/sys/arch/amd64/amd64/amd64_trap.S:1.44 Sat Jul 14 14:29:40 2018
+++ src/sys/arch/amd64/amd64/amd64_trap.S Sun Aug 12 06:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amd64_trap.S,v 1.44 2018/07/14 14:29:40 maxv Exp $ */
+/* $NetBSD: amd64_trap.S,v 1.45 2018/08/12 06:11:47 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -192,7 +192,7 @@ IDTVEC(trap01)
movl $MSR_GSBASE,%ecx
rdmsr
- cmpl $VM_MIN_KERNEL_ADDRESS_HIGH32,%edx
+ cmpl $VM_SPACE_SEP_HIGH32,%edx
jae .Lkern_dbentry
/* SS shadow, ignore the exception. */
@@ -265,7 +265,7 @@ IDTVEC(trap02)
movl $MSR_GSBASE,%ecx
rdmsr
- cmpl $VM_MIN_KERNEL_ADDRESS_HIGH32,%edx
+ cmpl $VM_SPACE_SEP_HIGH32,%edx
jae .Lnoswapgs
swapgs
Index: src/sys/arch/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.68 src/sys/arch/amd64/amd64/genassym.cf:1.69
--- src/sys/arch/amd64/amd64/genassym.cf:1.68 Fri Mar 30 10:01:36 2018
+++ src/sys/arch/amd64/amd64/genassym.cf Sun Aug 12 06:11:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.68 2018/03/30 10:01:36 maxv Exp $
+# $NetBSD: genassym.cf,v 1.69 2018/08/12 06:11:47 maxv Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -367,7 +367,7 @@ define NKL2_KIMG_ENTRIES NKL2_KIMG_ENTRI
define PGOFSET PGOFSET
define PGSHIFT PGSHIFT
-define VM_MIN_KERNEL_ADDRESS_HIGH32 (VM_MIN_KERNEL_ADDRESS >> 32)
+define VM_SPACE_SEP_HIGH32 (0xFFFF800000000000 >> 32)
define RESCHED_KPREEMPT RESCHED_KPREEMPT
