From 153fa3e00a19a90a01d7f2bfe1cf983c84f657e8 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 22 Aug 2012 16:44:55 -0700 Subject: [PATCH] kernel - Fix 32-bit build * Fix kprintf format mismatches in usched_bsd4.c for 32-bit builds. --- sys/kern/usched_bsd4.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/kern/usched_bsd4.c b/sys/kern/usched_bsd4.c index 52fb546..af02b68 100644 --- a/sys/kern/usched_bsd4.c +++ b/sys/kern/usched_bsd4.c @@ -604,7 +604,7 @@ batchy_looser_pri_test(struct lwp* lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask); + (unsigned long)mask); return 0; } @@ -615,7 +615,7 @@ batchy_looser_pri_test(struct lwp* lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask); + (unsigned long)mask); return 1; } @@ -740,7 +740,7 @@ bsd4_setrunqueue(struct lwp *lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask, + (unsigned long)mask, mycpu->gd_cpuid); while (mask) { @@ -759,7 +759,7 @@ bsd4_setrunqueue(struct lwp *lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask, + (unsigned long)mask, cpuid, mycpu->gd_cpuid); @@ -785,7 +785,7 @@ bsd4_setrunqueue(struct lwp *lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask, + (unsigned long)mask, cpuid, mycpu->gd_cpuid); @@ -801,7 +801,7 @@ bsd4_setrunqueue(struct lwp *lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask, + (unsigned long)mask, mycpu->gd_cpuid); while (mask) { @@ -819,7 +819,7 @@ bsd4_setrunqueue(struct lwp *lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask, + (unsigned long)mask, cpuid, mycpu->gd_cpuid); @@ -839,7 +839,7 @@ bsd4_setrunqueue(struct lwp *lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask, + (unsigned long)mask, mycpu->gd_cpuid); while (mask) { @@ -857,7 +857,7 @@ bsd4_setrunqueue(struct lwp *lp) lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, lp->lwp_thread->td_gd->gd_cpuid, - mask, + (unsigned long)mask, cpuid, mycpu->gd_cpuid); @@ -1501,9 +1501,9 @@ again: KTR_COND_LOG(usched_chooseproc_cc_not_good, lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, - lp->lwp_thread->td_gd->gd_cpumask, - siblings, - cpumask); + (unsigned long)lp->lwp_thread->td_gd->gd_cpumask, + (unsigned long)siblings, + (unsigned long)cpumask); cpunode = bsd4_pcpu[lp->lwp_thread->td_gd->gd_cpuid].cpunode; level = 0; @@ -1531,9 +1531,9 @@ again: KTR_COND_LOG(usched_chooseproc_cc_elected, lp->lwp_proc->p_pid == usched_bsd4_pid_debug, lp->lwp_proc->p_pid, - lp->lwp_thread->td_gd->gd_cpumask, - siblings, - cpumask); + (unsigned long)lp->lwp_thread->td_gd->gd_cpumask, + (unsigned long)siblings, + (unsigned long)cpumask); goto found; } @@ -1816,7 +1816,7 @@ sched_thread(void *dummy) KTR_LOG(usched_sched_thread_no_process_found, gd->gd_cpuid, - tmpmask); + (unsigned long)tmpmask); } } else { /* -- 1.7.7.2