diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-05-10 15:56:29 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-05-10 15:56:29 +0000 |
| commit | 34093eac5fdf901e43a0df765971fab8ec95f272 (patch) | |
| tree | dcd22f04eb1f01df0b5df911984ade2094453b68 /sys/arch/armish | |
| parent | aeaca088097fc9446b7dc82269369a80d6a08ec3 (diff) | |
VM_MAX_KERNEL_ADDRESS is the end of the kva range not the end of
addressable virtual memory space but arm ports were using a value of
0xffffffff for this.
Instead of using a shared VM_MAX_KERNEL_ADDRESS define add md
VM_KERNEL_SPACE_SIZE defines based on the KERNEL_VM_SIZE values
from the respective machdep.c files.
djm's novena was hitting "panic: bufinit: can't reserve VM for buffers"
without a similiar change.
ok miod@
Diffstat (limited to 'sys/arch/armish')
| -rw-r--r-- | sys/arch/armish/armish/armish_machdep.c | 12 | ||||
| -rw-r--r-- | sys/arch/armish/include/vmparam.h | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sys/arch/armish/armish/armish_machdep.c b/sys/arch/armish/armish/armish_machdep.c index abac7f07f71..ec3279c7ca0 100644 --- a/sys/arch/armish/armish/armish_machdep.c +++ b/sys/arch/armish/armish/armish_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armish_machdep.c,v 1.38 2015/05/08 22:56:53 miod Exp $ */ +/* $OpenBSD: armish_machdep.c,v 1.39 2015/05/10 15:56:28 jsg Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -119,18 +119,10 @@ #include <armish/dev/iq80321var.h> #include <armish/dev/obiovar.h> - - /* Kernel text starts 2MB in from the bottom of the kernel address space. */ #define KERNEL_TEXT_BASE (KERNEL_BASE + 0x00200000) #define KERNEL_VM_BASE (KERNEL_BASE + 0x10000000) - -/* - * The range 0xc1000000 - 0xcfffffff is available for kernel VM space - * Core-logic registers and I/O mappings occupy 0xfd000000 - 0xffffffff - */ -#define KERNEL_VM_SIZE 0x20000000 - +#define KERNEL_VM_SIZE VM_KERNEL_SPACE_SIZE /* * Address to call from cpu_reset() to reset the machine. diff --git a/sys/arch/armish/include/vmparam.h b/sys/arch/armish/include/vmparam.h index 6a8315f1316..7e6671e51a5 100644 --- a/sys/arch/armish/include/vmparam.h +++ b/sys/arch/armish/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.8 2011/09/21 10:09:52 miod Exp $ */ +/* $OpenBSD: vmparam.h,v 1.9 2015/05/10 15:56:28 jsg Exp $ */ /* $NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $ */ /* @@ -56,6 +56,8 @@ */ #define KERNEL_BASE ARM_KERNEL_BASE +#define VM_KERNEL_SPACE_SIZE 0x20000000 + /* * Override the default pager_map size, there's not enough KVA. */ |