From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 28 Sep 2004 16:53:02 +0000 (+0000)
Subject: Fixed compilation warnings in the CKRM cpu controller.
X-Git-Tag: before-enable-kexec-patch~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d7298d4b1ac814ca287811cbfb57b518dd55d037;p=linux-2.6.git

Fixed compilation warnings in the CKRM cpu controller.
---

diff --git a/kernel/ckrm/ckrm_cpu_class.c b/kernel/ckrm/ckrm_cpu_class.c
index ad45380ee..cdb8af700 100644
--- a/kernel/ckrm/ckrm_cpu_class.c
+++ b/kernel/ckrm/ckrm_cpu_class.c
@@ -269,7 +269,7 @@ int ckrm_cpu_get_stats(void *my_res, struct seq_file * sfile)
 		   );
 	for_each_online_cpu(i) {
 		lrq = get_ckrm_lrq(cls,i);		
-		seq_printf(sfile, "\tlrq %d demand= %lu weight= %d lrq_load= %lu cvt= %llu sav=%lu\n",i,stat->local_stats[i].cpu_demand,local_class_weight(lrq),lrq->lrq_load,lrq->local_cvt,lrq->savings);
+		seq_printf(sfile, "\tlrq %d demand= %lu weight= %d lrq_load= %lu cvt= %llu sav=%llu\n",i,stat->local_stats[i].cpu_demand,local_class_weight(lrq),lrq->lrq_load,lrq->local_cvt,lrq->savings);
 	}
 
 	seq_printf(sfile, "-------- CPU Class Status END ---------\n");
diff --git a/kernel/ckrm/ckrm_cpu_monitor.c b/kernel/ckrm/ckrm_cpu_monitor.c
index c83c83fca..09bdb2149 100644
--- a/kernel/ckrm/ckrm_cpu_monitor.c
+++ b/kernel/ckrm/ckrm_cpu_monitor.c
@@ -910,7 +910,7 @@ void ckrm_start_monitor(void)
 
 void ckrm_kill_monitor(void)
 {
-	int interval = HZ;
+	// int interval = HZ;
 
 	printk("killing process %d\n", cpu_monitor_pid);
 	if (cpu_monitor_pid > 0) {