diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-12-08 22:15:49 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-12-08 22:15:49 +0000 |
| commit | caa71d76460ab7df8372d63a5db620ff47d5471e (patch) | |
| tree | 541edf8a474be69a9c1db2a1d4f9ee6915068c7a /sys | |
| parent | 4f4728bc5efedd7cf428af6253b79794372f70e4 (diff) | |
Unconditionnaly move kernel virtual memory space to XKSEG, now that previous
context.S fixes allows these settings to work for kernels linked in CKSEG0.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mips64/include/vmparam.h | 14 | ||||
| -rw-r--r-- | sys/arch/sgi/include/vmparam.h | 20 |
2 files changed, 7 insertions, 27 deletions
diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h index 3e698155915..11a74aa4771 100644 --- a/sys/arch/mips64/include/vmparam.h +++ b/sys/arch/mips64/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.19 2009/12/07 19:23:52 miod Exp $ */ +/* $OpenBSD: vmparam.h,v 1.20 2009/12/08 22:15:47 miod Exp $ */ /* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */ /* @@ -49,7 +49,7 @@ * is the top (end) of the user stack. */ #define USRTEXT 0x0000000000400000L -#define USRSTACK 0x0000000080000000L /* Start of user stack */ +#define USRSTACK VM_MAXUSER_ADDRESS /* Start of user stack */ /* * Virtual memory related constants, all in bytes @@ -97,15 +97,13 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS ((vaddr_t)0x0000000000004000L) #define VM_MAXUSER_ADDRESS ((vaddr_t)0x0000000080000000L) -#define VM_MAX_ADDRESS ((vaddr_t)0x0000000080000000L) -#ifndef VM_MIN_KERNEL_ADDRESS -#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0xffffffffc0000000L) -#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0xfffffffffffff000L) -#endif +#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS +#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0xc000000000000000L) +#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0xc000000040000000L) /* map PIE below 256MB (non-pie link address) to avoid mmap pressure */ #define VM_PIE_MIN_ADDR PAGE_SIZE -#define VM_PIE_MAX_ADDR 0x10000000UL +#define VM_PIE_MAX_ADDR (0x10000000UL) #ifndef VM_NFREELIST #define VM_NFREELIST 1 diff --git a/sys/arch/sgi/include/vmparam.h b/sys/arch/sgi/include/vmparam.h index 6ffb53aa6c9..174c25f9573 100644 --- a/sys/arch/sgi/include/vmparam.h +++ b/sys/arch/sgi/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.6 2009/11/22 10:05:02 miod Exp $ */ +/* $OpenBSD: vmparam.h,v 1.7 2009/12/08 22:15:48 miod Exp $ */ /* public domain */ #ifndef _SGI_VMPARAM_H_ #define _SGI_VMPARAM_H_ @@ -19,24 +19,6 @@ #define VM_NFREELIST 2 #define VM_FREELIST_DMA32 1 /* memory suitable for 32-bit DMA */ -/* - * On systems which may use R5000 processors, we limit the kernel virtual - * address space to KSSEG and KSEG3. - * On systems with R10000 family processors, we use the XKSEG which allows - * for a much larger virtual memory size. - * - * All Octane and Origin class systems are R10000 family based only, - * so TGT_COHERENT is safe to use so far. - */ - -#ifdef TGT_COHERENT -#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0xc000000000000000L) -#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0xc000000040000000L) -#else -#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0xffffffffc0000000L) -#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0xfffffffffffff000L) -#endif - #include <mips64/vmparam.h> #endif /* _SGI_VMPARAM_H_ */ |