upgrade to ckrm e17

[linux-2.6.git] / kernel / ckrm / ckrm_cpu_monitor.c

diff --git a/kernel/ckrm/ckrm_cpu_monitor.c b/kernel/ckrm/ckrm_cpu_monitor.c
index a608f4e..23f48ec 100644 (file)
--- a/kernel/ckrm/ckrm_cpu_monitor.c
+++ b/kernel/ckrm/ckrm_cpu_monitor.c
@@ -22,12 +22,15 @@
 #include <asm/errno.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
-#include <linux/ckrm.h>
+#include <linux/ckrm_events.h>
 #include <linux/ckrm_rc.h>
 #include <linux/ckrm_tc.h>
 #include <asm/div64.h>
 #include <linux/ckrm_sched.h>
 
+#warning MEF I cannot believe that vserver changes force the following include statement: FIX THIS!
+#include <linux/vs_cvirt.h>
+
 #define CPU_MONITOR_INTERVAL (HZ) /*how often do we adjust the shares*/
 #define CKRM_SHARE_MAX (1<<CKRM_SHARE_ACCURACY)
 
@@ -838,8 +841,12 @@ static void adjust_lrq_weight(struct ckrm_cpu_class *clsptr, int cpu_online)
                total_pressure += lrq->lrq_load;
        }
 
+#if 1
+#warning "ACB taking out suspicious early return"
+#else
        if (! total_pressure)
                return;
+#endif
        
        class_weight = cpu_class_weight(clsptr) * cpu_online;
 
@@ -955,7 +962,7 @@ static int ckrm_cpu_monitord(void *nothing)
        daemonize("ckrm_cpu_ctrld");
        for (;;) {
                /*sleep for sometime before next try*/
-               set_current_state(TASK_INTERRUPTIBLE);
+               set_current_state(TASK_UNINTERRUPTIBLE);
                schedule_timeout(CPU_MONITOR_INTERVAL);
                ckrm_cpu_monitor(1);
                if (thread_exit) {