From 6568ff60f8a4638b119c07ea1509ff0bc884661a Mon Sep 17 00:00:00 2001
From: stefan <stefan@openbsd.org>
Date: Sat, 20 Aug 2016 19:22:05 +0000
Subject: [PATCH] Format string fixes in debug code: need %llx to print 64 bit
 values

ok kettenis@ deraadt@ mlarkin@
---
 sys/arch/amd64/amd64/trap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c
index ae69d576cec..2f0edcbcf8f 100644
--- a/sys/arch/amd64/amd64/trap.c
+++ b/sys/arch/amd64/amd64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.49 2016/02/27 13:08:06 mpi Exp $	*/
+/*	$OpenBSD: trap.c,v 1.50 2016/08/20 19:22:05 stefan Exp $	*/
 /*	$NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $	*/
 
 /*-
@@ -244,7 +244,7 @@ copyfault:
 	case T_STKFLT|T_USER:
 	case T_NMI|T_USER:
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d (%s): BUS at rip %lx addr %lx\n",
+		printf("pid %d (%s): BUS at rip %llx addr %llx\n",
 		    p->p_pid, p->p_comm, frame->tf_rip, rcr2());
 		frame_dump(frame);
 #endif
@@ -268,7 +268,7 @@ copyfault:
 		goto out;
 	case T_FPOPFLT|T_USER:		/* coprocessor operand fault */
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d (%s): ILL at rip %lx addr %lx\n",
+		printf("pid %d (%s): ILL at rip %llx addr %llx\n",
 		    p->p_pid, p->p_comm, frame->tf_rip, rcr2());
 		frame_dump(frame);
 #endif
@@ -400,7 +400,7 @@ faultcommon:
 			trapsignal(p, SIGKILL, T_PAGEFLT, SEGV_MAPERR, sv);
 		} else {
 #ifdef TRAP_SIGDEBUG
-			printf("pid %d (%s): SEGV at rip %lx addr %lx\n",
+			printf("pid %d (%s): SEGV at rip %llx addr %lx\n",
 			    p->p_pid, p->p_comm, frame->tf_rip, fa);
 			frame_dump(frame);
 #endif
-- 
2.20.1