aboutsummaryrefslogtreecommitdiff
path: root/sys/ia64/include
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2013-02-25 02:41:38 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2013-02-25 02:41:38 +0000
commitc78a079c40e478c6cd498e80769c309c68357e6e (patch)
tree26f1cc35315e7297206cf28ea0c2567bc575624b /sys/ia64/include
parent6d4a620ebafd7e013a14fc0189399d0b6ae7a901 (diff)
downloadsrc-c78a079c40e478c6cd498e80769c309c68357e6e.tar.gz
src-c78a079c40e478c6cd498e80769c309c68357e6e.zip
kernacc() expects all KVAs to be covered in the kernel map. With the
introduction of the PBVM, this stopped being the case. Redefine the VM parameters so that the PBVM is included in the kernel map. In particular this introduces VM_INIT_KERNEL_ADDRESS to point to the base of region 5 now that VM_MIN_KERNEL_ADDRESS points to the base of region 4 to include the PBVM. While here define KERNBASE to the actual link address of the kernel as is intended. PR: 169926
Notes
Notes: svn path=/head/; revision=247251
Diffstat (limited to 'sys/ia64/include')
-rw-r--r--sys/ia64/include/vmparam.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/ia64/include/vmparam.h b/sys/ia64/include/vmparam.h
index 16c5e7dda7a9..10125db65ad8 100644
--- a/sys/ia64/include/vmparam.h
+++ b/sys/ia64/include/vmparam.h
@@ -181,12 +181,13 @@
/* user/kernel map constants */
#define VM_MIN_ADDRESS 0
#define VM_MAXUSER_ADDRESS IA64_RR_BASE(IA64_VM_MINKERN_REGION)
-#define VM_MIN_KERNEL_ADDRESS IA64_RR_BASE(IA64_VM_MINKERN_REGION + 1)
-#define VM_MAX_KERNEL_ADDRESS \
- (VM_MIN_KERNEL_ADDRESS + IA64_REGION_GAP_START - 1)
+#define VM_MIN_KERNEL_ADDRESS VM_MAXUSER_ADDRESS
+#define VM_INIT_KERNEL_ADDRESS IA64_RR_BASE(IA64_VM_MINKERN_REGION + 1)
+#define VM_MAX_KERNEL_ADDRESS (IA64_RR_BASE(IA64_VM_MINKERN_REGION + 2) - 1)
#define VM_MAX_ADDRESS ~0UL
-#define KERNBASE VM_MAXUSER_ADDRESS
+/* We link the kernel at IA64_PBVM_BASE. */
+#define KERNBASE IA64_PBVM_BASE
/*
* USRSTACK is the top (end) of the user stack. Immediately above the user