Module Name: src
Committed By: riz
Date: Thu Apr 26 02:57:48 UTC 2012
Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6]: trap.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #201):
sys/arch/sparc64/sparc64/trap.c: revision 1.176
Fix 32bit build
To generate a diff of this commit:
cvs rdiff -u -r1.168.8.2 -r1.168.8.3 src/sys/arch/sparc64/sparc64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.168.8.2 src/sys/arch/sparc64/sparc64/trap.c:1.168.8.3
--- src/sys/arch/sparc64/sparc64/trap.c:1.168.8.2 Tue Apr 24 19:44:16 2012
+++ src/sys/arch/sparc64/sparc64/trap.c Thu Apr 26 02:57:48 2012
@@ -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 @@ badtrap:
sig = SIGBUS;
ksi.ksi_trap = type;
ksi.ksi_code = BUS_ADRALN;
- ksi.ksi_addr = (void*)dsfar;
+ ksi.ksi_addr = (void*)(intptr_t)dsfar;
}
break;
