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

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

details:   https://anonhg.NetBSD.org/src/rev/b1b6493ee121
branches:  netbsd-6
changeset: 774041:b1b6493ee121
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Apr 26 02:57:48 2012 +0000

description:
Pull up following revision(s) (requested by martin in ticket #201):
        sys/arch/sparc64/sparc64/trap.c: revision 1.176
Fix 32bit build

diffstat:

 sys/arch/sparc64/sparc64/trap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 68553e87bf76 -r b1b6493ee121 sys/arch/sparc64/sparc64/trap.c
--- a/sys/arch/sparc64/sparc64/trap.c   Thu Apr 26 02:49:27 2012 +0000
+++ b/sys/arch/sparc64/sparc64/trap.c   Thu Apr 26 02:57:48 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.168.8.2 2012/04/24 19:44:16 riz Exp $ */
+/*     $NetBSD: trap.c,v 1.168.8.3 2012/04/26 02:57:48 riz Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.168.8.2 2012/04/24 19:44:16 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.168.8.3 2012/04/26 02:57:48 riz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -748,7 +748,7 @@
                sig = SIGBUS;
                ksi.ksi_trap = type;
                ksi.ksi_code = BUS_ADRALN;
-               ksi.ksi_addr = (void*)dsfar;
+               ksi.ksi_addr = (void*)(intptr_t)dsfar;
                }
                break;