From 8eb98bfca151618daab1f3abbbff7617fe2fca86 Mon Sep 17 00:00:00 2001
From: sf <sf@openbsd.org>
Date: Wed, 30 Apr 2014 06:24:23 +0000
Subject: [PATCH] format string fixes for (u)int64 vars

ok kettenis@
---
 sys/arch/amd64/amd64/cpu.c  |  4 ++--
 sys/arch/amd64/amd64/trap.c | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c
index 19e054efcd2..88725f77d78 100644
--- a/sys/arch/amd64/amd64/cpu.c
+++ b/sys/arch/amd64/amd64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.60 2014/03/29 18:09:28 guenther Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.61 2014/04/30 06:24:23 sf Exp $	*/
 /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
 
 /*-
@@ -535,7 +535,7 @@ cpu_attach(struct device *parent, struct device *self, void *aux)
 	if (mp_verbose) {
 		printf("%s: kstack at 0x%lx for %d bytes\n",
 		    sc->sc_dev.dv_xname, kstack, USPACE);
-		printf("%s: idle pcb at %p, idle sp at 0x%lx\n",
+		printf("%s: idle pcb at %p, idle sp at 0x%llx\n",
 		    sc->sc_dev.dv_xname, pcb, pcb->pcb_rsp);
 	}
 #endif
diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c
index 3987b2c3fc5..4ef833ba31e 100644
--- a/sys/arch/amd64/amd64/trap.c
+++ b/sys/arch/amd64/amd64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.36 2014/04/18 11:51:16 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.37 2014/04/30 06:24:23 sf Exp $	*/
 /*	$NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $	*/
 
 /*-
@@ -205,12 +205,12 @@ trap(struct trapframe *frame)
 		else
 			printf("unknown trap %ld", (u_long)frame->tf_trapno);
 		printf(" in %s mode\n", (type & T_USER) ? "user" : "supervisor");
-		printf("trap type %d code %lx rip %lx cs %lx rflags %lx cr2 "
-		       " %lx cpl %x rsp %lx\n",
-		    type, frame->tf_err, (u_long)frame->tf_rip, frame->tf_cs,
+		printf("trap type %d code %llx rip %llx cs %llx rflags %llx cr2 "
+		       " %llx cpl %x rsp %llx\n",
+		    type, frame->tf_err, frame->tf_rip, frame->tf_cs,
 		    frame->tf_rflags, rcr2(), curcpu()->ci_ilevel, frame->tf_rsp);
 
-		panic("trap type %d, code=%lx, pc=%lx",
+		panic("trap type %d, code=%llx, pc=%llx",
 		    type, frame->tf_err, frame->tf_rip);
 		/*NOTREACHED*/
 
-- 
2.20.1