Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch it's called VM_MAXUSER_ADDRESS32 not VM_MAXUSER32_A...



details:   https://anonhg.NetBSD.org/src/rev/024e2eaaf0ab
branches:  trunk
changeset: 362224:024e2eaaf0ab
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu May 31 22:26:36 2018 +0000

description:
it's called VM_MAXUSER_ADDRESS32 not VM_MAXUSER32_ADDRESS.

fixes mips64 builds, and likely fixes riscv when it happens again.

diffstat:

 sys/arch/mips/include/vmparam.h  |  6 +++---
 sys/arch/riscv/include/vmparam.h |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r a906d6965848 -r 024e2eaaf0ab sys/arch/mips/include/vmparam.h
--- a/sys/arch/mips/include/vmparam.h   Thu May 31 20:52:53 2018 +0000
+++ b/sys/arch/mips/include/vmparam.h   Thu May 31 22:26:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.60 2017/09/07 06:36:24 skrll Exp $       */
+/*     $NetBSD: vmparam.h,v 1.61 2018/05/31 22:26:36 mrg Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -79,7 +79,7 @@
  * in an instruction.
  */
 #define        USRSTACK        (VM_MAXUSER_ADDRESS-0x8000) /* Start of user stack */
-#define        USRSTACK32      ((uint32_t)VM_MAXUSER32_ADDRESS-0x8000)
+#define        USRSTACK32      ((uint32_t)VM_MAXUSER_ADDRESS32-0x8000)
 
 /*
  * Virtual memory related constants, all in bytes
@@ -177,7 +177,7 @@
 #define VM_MAX_KERNEL_ADDRESS  ((vaddr_t)-0x00004000)  /* 0xFFFFFFFFFFFFC000 */
 #endif
 #endif
-#define VM_MAXUSER32_ADDRESS   ((vaddr_t)(1UL << 31))  /* 0x0000000080000000 */
+#define VM_MAXUSER_ADDRESS32   ((vaddr_t)(1UL << 31))  /* 0x0000000080000000 */
 
 /*
  * The address to which unspecified mapping requests default
diff -r a906d6965848 -r 024e2eaaf0ab sys/arch/riscv/include/vmparam.h
--- a/sys/arch/riscv/include/vmparam.h  Thu May 31 20:52:53 2018 +0000
+++ b/sys/arch/riscv/include/vmparam.h  Thu May 31 22:26:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.3 2017/06/24 13:43:36 joerg Exp $        */
+/*     $NetBSD: vmparam.h,v 1.4 2018/05/31 22:26:36 mrg Exp $  */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  * page-aligned.
  */
 #define        USRSTACK        (VM_MAXUSER_ADDRESS-PAGE_SIZE) /* Start of user stack */
-#define        USRSTACK32      ((uint32_t)VM_MAXUSER32_ADDRESS-PAGE_SIZE)
+#define        USRSTACK32      ((uint32_t)VM_MAXUSER_ADDRESS32-PAGE_SIZE)
 
 /*
  * Virtual memory related constants, all in bytes
@@ -129,7 +129,7 @@
 #define VM_MAX_KERNEL_ADDRESS  ((vaddr_t)-0x40000000)  /* 0xFFFFFFFFC0000000 */
 #endif
 #define VM_MAX_ADDRESS         VM_MAXUSER_ADDRESS
-#define VM_MAXUSER32_ADDRESS   ((vaddr_t)(1UL << 31))/* 0x0000000080000000 */
+#define VM_MAXUSER_ADDRESS32   ((vaddr_t)(1UL << 31))/* 0x0000000080000000 */
 
 /*
  * The address to which unspecified mapping requests default



Home | Main Index | Thread Index | Old Index