Fix warnings in sched and sched_debug
PATCH v7 1/1 Fix warnings in sched and sched_debug
The first patch I sent out did not have a sign-off; I had trouble with my patch tools.
This patch fixes all warnings seen on powerpc during compilation of the CFS patch. It also fixes errors (side-effect of the warnings), where some of the data is printed as negative values.
Applies on top of cfs v7
Signed-off-by Balbir Singh <[email protected]>
---
kernel/sched.c | 34 +++++++++++++++++----------------- kernel/sched_debug.c | 16 ++++++++-------- 2 files changed, 25 insertions(+), 25 deletions(-)
kernel/sched.c renamed from kernel/sched.c~cfs-v7-fix-sched-debug-warnings +17 -17
@@ -229,7 +229,7 @@ char * sched_print_task_state(struct tasunsigned long long t0, t1;#define P (F ) \ - buffer += sprintf(buffer, "%-25s:%20Ld\n", #F, p->F) + buffer += sprintf(buffer, "%-25s:%20Ld\n", #F, (long long)p->F)P (wait_start);P (wait_start_fair);
@@ -248,22 +248,22 @@ char * sched_print_task_state(struct tas t0 =sched_clock (); t1 =sched_clock (); - buffer +=sprintf (buffer,"%-25s:%20Ld\n" ,"clock-delta" , t1-t0); - buffer +=sprintf (buffer,"%-25s:%20Ld\n" , -"rq-wait_runtime" , this_rq->wait_runtime); - buffer +=sprintf (buffer,"%-25s:%20Ld\n" , -"rq-fair_clock" , this_rq->fair_clock); - buffer +=sprintf (buffer,"%-25s:%20Ld\n" , -"rq-clock" , this_rq->clock); - buffer +=sprintf (buffer,"%-25s:%20Ld\n" , -"rq-prev_clock_raw" , this_rq->prev_clock_raw); - buffer +=sprintf (buffer,"%-25s:%20Ld\n" , -"rq-clock_max_delta" , this_rq->clock_max_delta); - buffer +=sprintf (buffer,"%-25s:%20u\n" , -"rq-clock_warps" , this_rq->clock_warps); - buffer +=sprintf (buffer,"%-25s:%20u\n" , -"rq-clock_unstable_events" , - this_rq->clock_unstable_events); + buffer +=sprintf (buffer,"%-25s:%20Ld\n" ,"clock-delta" , + (long long )t1-t0); + buffer +=sprintf (buffer,"%-25s:%20Ld\n" ,"rq-wait_runtime" , + (long long )this_rq->wait_runtime); + buffer +=sprintf (buffer,"%-25s:%20Ld\n" ,"rq-fair_clock" , + (long long )this_rq->fair_clock); + buffer +=sprintf (buffer,"%-25s:%20Ld\n" ,"rq-clock" , + (long long )this_rq->clock); + buffer +=sprintf (buffer,"%-25s:%20Ld\n" ,"rq-prev_clock_raw" , + (long long )this_rq->prev_clock_raw); + buffer +=sprintf (buffer,"%-25s:%20Ld\n" ,"rq-clock_max_delta" , + (long long )this_rq->clock_max_delta); + buffer +=sprintf (buffer,"%-25s:%20u\n" ,"rq-clock_warps" , + this_rq->clock_warps); + buffer +=sprintf (buffer,"%-25s:%20u\n" ,"rq-clock_unstable_events" , + this_rq->clock_unstable_events);return buffer; }
kernel/sched_debug.c renamed from kernel/sched_debug.c~cfs-v7-fix-sched-debug-warnings +8 -8
@@ -45,13 +45,13 @@ print_task(struct seq_file *m, struct rqSEQ_printf (m,"%14s %5d %12Ld %11Ld %10Ld %9Ld %5d " "%13Ld %13Ld %13Ld\n" , p->comm, p->pid, - p->fair_key, p->fair_key - rq->fair_clock, - p->wait_runtime, - p->nr_switches, + (long long )p->fair_key, (long long )p->fair_key - rq->fair_clock, + (long long )p->wait_runtime, + (long long )p->nr_switches, p->prio, - p->wait_start_fair - rq->fair_clock, - p->sum_exec_runtime, - p->sum_wait_runtime); + (long long )p->wait_start_fair - rq->fair_clock, + (long long )p->sum_exec_runtime, + (long long )p->sum_wait_runtime); }static void print_rq (struct seq_file *m,struct rq *rq,u64 now)
@@ -83,7 +83,7 @@ static void print_cpu(struct seq_file *mSEQ_printf (m,"\ncpu: %d\n" , cpu);#define P (x) \ - SEQ_printf(m, " .%-22s: %Ld\n", #x, (u64)(rq->x)) + SEQ_printf(m, " .%-22s: %Lu\n", #x, (unsigned long long)(rq->x))P (nr_running);P (raw_weighted_load);
@@ -110,7 +110,7 @@ static int sched_debug_show(struct seq_fint cpu;SEQ_printf (m,"Sched Debug Version: v0.02\n" ); -SEQ_printf (m,"now at %Ld nsecs\n" , (unsigned long long )now); +SEQ_printf (m,"now at %Lu nsecs\n" , (unsigned long long )now);for_each_online_cpu (cpu)print_cpu (m, cpu, now);
_
Signature · 4 lines
Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL
Ingo Molnar
AppliedQuoted 8 lines · Balbir Singh
The first patch I sent out did not have a sign-off; I had trouble with my patch tools.
This patch fixes all warnings seen on powerpc during compilation of the CFS patch. It also fixes errors (side-effect of the warnings), where some of the data is printed as negative values.
Applies on top of cfs v7
thanks, applied! Your fixes should show up in -v8.
Ingo