From 24501ccc60b14ae8c1a8c0c4fc146d98cdb7f75b Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Mon, 11 Sep 2000 23:55:10 +0000
Subject: [PATCH] Fix some printf format string warnings due to sizeof(int) !=
 sizeof(long) on the alpha.

---
 sys/kern/kern_shutdown.c |  8 ++++----
 sys/kern/kern_switch.c   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 534791d2899c..280e2b87329a 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -176,21 +176,21 @@ print_uptime(void)
 	printf("Uptime: ");
 	f = 0;
 	if (ts.tv_sec >= 86400) {
-		printf("%ldd", ts.tv_sec / 86400);
+		printf("%ldd", (long)ts.tv_sec / 86400);
 		ts.tv_sec %= 86400;
 		f = 1;
 	}
 	if (f || ts.tv_sec >= 3600) {
-		printf("%ldh", ts.tv_sec / 3600);
+		printf("%ldh", (long)ts.tv_sec / 3600);
 		ts.tv_sec %= 3600;
 		f = 1;
 	}
 	if (f || ts.tv_sec >= 60) {
-		printf("%ldm", ts.tv_sec / 60);
+		printf("%ldm", (long)ts.tv_sec / 60);
 		ts.tv_sec %= 60;
 		f = 1;
 	}
-	printf("%lds\n", ts.tv_sec);
+	printf("%lds\n", (long)ts.tv_sec);
 }
 
 /*
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index 8f47dba110f9..296e627c4a64 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -104,8 +104,8 @@ setrunqueue(struct proc *p)
 	 * collapse the first three classes into a single contiguous
 	 * queue.  XXX FIXME.
 	 */
-	CTR4(KTR_PROC, "setrunqueue: proc %p (pid %d, %s), schedlock %x",
-		p, p->p_pid, p->p_comm, sched_lock.mtx_lock);
+	CTR4(KTR_PROC, "setrunqueue: proc %p (pid %d, %s), schedlock %lx",
+		p, p->p_pid, p->p_comm, (long)sched_lock.mtx_lock);
 	if (p->p_rtprio.type == RTP_PRIO_ITHREAD) {	/* interrupt thread */
 		pri = p->p_rtprio.prio;
 		q = &itqueues[pri];
@@ -142,8 +142,8 @@ remrunqueue(struct proc *p)
 	u_int32_t *which;
 	u_int8_t pri;
 
-	CTR4(KTR_PROC, "remrunqueue: proc %p (pid %d, %s), schedlock %x",
-		p, p->p_pid, p->p_comm, sched_lock.mtx_lock);
+	CTR4(KTR_PROC, "remrunqueue: proc %p (pid %d, %s), schedlock %lx",
+		p, p->p_pid, p->p_comm, (long)sched_lock.mtx_lock);
 	mtx_assert(&sched_lock, MA_OWNED);
 	pri = p->p_rqindex;
 	if (p->p_rtprio.type == RTP_PRIO_ITHREAD) {
@@ -231,8 +231,8 @@ chooseproc(void)
 		q = &idqueues[pri];
 		which = &idqueuebits;
 	} else {
-		CTR1(KTR_PROC, "chooseproc: idleproc, schedlock %x",
-			sched_lock.mtx_lock);
+		CTR1(KTR_PROC, "chooseproc: idleproc, schedlock %lx",
+			(long)sched_lock.mtx_lock);
 		idleproc->p_stat = SRUN;
 		return idleproc;
 	}
@@ -248,8 +248,8 @@ chooseproc(void)
 		}
 	}
 #endif
-	CTR4(KTR_PROC, "chooseproc: proc %p (pid %d, %s), schedlock %x",
-		p, p->p_pid, p->p_comm, sched_lock.mtx_lock);
+	CTR4(KTR_PROC, "chooseproc: proc %p (pid %d, %s), schedlock %lx",
+		p, p->p_pid, p->p_comm, (long)sched_lock.mtx_lock);
 	KASSERT(p, ("chooseproc: no proc on busy queue"));
 	TAILQ_REMOVE(q, p, p_procq);
 	if (TAILQ_EMPTY(q))