[src/netbsd-1-5]: src/sys/arch/sparc/sparc Pull up revision 1.132 from trunk.

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

details:   https://anonhg.NetBSD.org/src/rev/d4a7211de6e1
branches:  netbsd-1-5
changeset: 488734:d4a7211de6e1
user:      pk <pk%NetBSD.org@localhost>
date:      Wed Jul 26 22:46:37 2000 +0000

description:
Pull up revision 1.132 from trunk.

Fix delay slot error in the SUN4_MMU3L startup code.

diffstat:

 sys/arch/sparc/sparc/locore.s |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r e17a7fb006dc -r d4a7211de6e1 sys/arch/sparc/sparc/locore.s
--- a/sys/arch/sparc/sparc/locore.s     Wed Jul 26 21:30:34 2000 +0000
+++ b/sys/arch/sparc/sparc/locore.s     Wed Jul 26 22:46:37 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.132 2000/05/31 11:23:21 pk Exp $  */
+/*     $NetBSD: locore.s,v 1.132.2.1 2000/07/26 22:46:37 pk Exp $      */
 
 /*
  * Copyright (c) 1996 Paul Kranenburg
@@ -3623,6 +3623,7 @@
        lduba   [%l3] ASI_CONTROL, %l3
        cmp     %l3, 0x24 ! XXX - SUN4_400
        bne     no_3mmu
+        nop
        add     %l0, 2, %l0             ! get to proper half-word in RG space
        add     %l1, 2, %l1
        lduha   [%l0] ASI_REGMAP, %l4   ! regmap[highva] = regmap[lowva];
@@ -4507,7 +4508,7 @@
        /*
         * We must preserve several global registers across the call
         * to uvm_pageidlezero().  Use the %ix registers for this, but
-        * since we might still be running in our our caller's frame
+        * since we might still be running in our caller's frame
         * (if we came here from cpu_switch()), we need to setup a
         * frame first.
         */