[src/trunk]: src/sys/arch/mips Use the architecture documented name ULR for t...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1676879c9110
branches:  trunk
changeset: 1026275:1676879c9110
user:      simonb <simonb%NetBSD.org@localhost>
date:      Tue Nov 16 06:11:52 2021 +0000

description:
Use the architecture documented name ULR for the RDHWR user local
register.

diffstat:

 sys/arch/mips/include/cpuregs.h |  6 +++---
 sys/arch/mips/mips/cpu_subr.c   |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 026f5877d5e3 -r 1676879c9110 sys/arch/mips/include/cpuregs.h
--- a/sys/arch/mips/include/cpuregs.h   Tue Nov 16 06:04:52 2021 +0000
+++ b/sys/arch/mips/include/cpuregs.h   Tue Nov 16 06:11:52 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpuregs.h,v 1.115 2021/11/16 06:04:52 simonb Exp $     */
+/*     $NetBSD: cpuregs.h,v 1.116 2021/11/16 06:11:52 simonb Exp $     */
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -880,7 +880,7 @@
 #define        MIPS_HWR_SYNCI_STEP             _(1)    /* Address step size for SYNCI */
 #define        MIPS_HWR_CC                     _(2)    /* Hi-res cycle counter */
 #define        MIPS_HWR_CCRES                  _(3)    /* Cycle counter resolution */
-#define        MIPS_HWR_UL                     _(29)   /* Userlocal */
+#define        MIPS_HWR_ULR                    _(29)   /* Userlocal */
 #define        MIPS_HWR_IMPL30                 _(30)   /* Implementation dependent use */
 #define        MIPS_HWR_IMPL31                 _(31)   /* Implementation dependent use */
 
@@ -889,7 +889,7 @@
  */
 #define        MIPS_HWRENA_IMPL31              __BIT(MIPS_HWR_IMPL31)
 #define        MIPS_HWRENA_IMPL30              __BIT(MIPS_HWR_IMPL30)
-#define        MIPS_HWRENA_UL                  __BIT(MIPS_HWR_UL)
+#define        MIPS_HWRENA_ULR                 __BIT(MIPS_HWR_ULR)
 #define        MIPS_HWRENA_CCRES               __BIT(MIPS_HWR_CCRES)
 #define        MIPS_HWRENA_CC                  __BIT(MIPS_HWR_CC)
 #define        MIPS_HWRENA_SYNCI_STEP          __BIT(MIPS_HWR_SYNCI_STEP)
diff -r 026f5877d5e3 -r 1676879c9110 sys/arch/mips/mips/cpu_subr.c
--- a/sys/arch/mips/mips/cpu_subr.c     Tue Nov 16 06:04:52 2021 +0000
+++ b/sys/arch/mips/mips/cpu_subr.c     Tue Nov 16 06:11:52 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.58 2020/08/17 15:22:51 skrll Exp $      */
+/*     $NetBSD: cpu_subr.c,v 1.59 2021/11/16 06:11:52 simonb Exp $     */
 
 /*-
  * Copyright (c) 2010, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.58 2020/08/17 15:22:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.59 2021/11/16 06:11:52 simonb Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -217,7 +217,7 @@
 
        if (CPUISMIPSNNR2) {
                mipsNN_cp0_hwrena_write(
-                   (MIPS_HAS_USERLOCAL ? MIPS_HWRENA_UL : 0)
+                   (MIPS_HAS_USERLOCAL ? MIPS_HWRENA_ULR : 0)
                    | MIPS_HWRENA_CCRES
                    | MIPS_HWRENA_CC
                    | MIPS_HWRENA_SYNCI_STEP