[src/netbsd-7]: src/sys/arch/sparc64/sparc64 Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/2506fb8e074f
branches:  netbsd-7
changeset: 798242:2506fb8e074f
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 14 06:50:37 2014 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #14):
        sys/arch/sparc64/sparc64/locore.s: revision 1.370
Add missing delay slot in DEBUG kernel.

diffstat:

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

diffs (17 lines):

diff -r 99462ad3228c -r 2506fb8e074f sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Wed Aug 13 21:50:56 2014 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Thu Aug 14 06:50:37 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.369 2014/07/30 13:50:33 palle Exp $       */
+/*     $NetBSD: locore.s,v 1.369.2.1 2014/08/14 06:50:37 martin Exp $  */
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -4465,6 +4465,7 @@
        
        set     1f, %o0         ! Debug printf
        call    _C_LABEL(prom_printf)
+        nop
        .data
 1:
        .asciz  "Setting trap base...\r\n"