git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[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
5f59b37
..
4a6ea7a
100644
(file)
--- a/
kernel/ckrm/ckrm_cpu_monitor.c
+++ b/
kernel/ckrm/ckrm_cpu_monitor.c
@@
-22,7
+22,7
@@
#include <asm/errno.h>
#include <linux/list.h>
#include <linux/spinlock.h>
#include <asm/errno.h>
#include <linux/list.h>
#include <linux/spinlock.h>
-#include <linux/ckrm
_events
.h>
+#include <linux/ckrm.h>
#include <linux/ckrm_rc.h>
#include <linux/ckrm_tc.h>
#include <asm/div64.h>
#include <linux/ckrm_rc.h>
#include <linux/ckrm_tc.h>
#include <asm/div64.h>
@@
-841,9
+841,8
@@
static void adjust_lrq_weight(struct ckrm_cpu_class *clsptr, int cpu_online)
total_pressure += lrq->lrq_load;
}
total_pressure += lrq->lrq_load;
}
-#define FIX_SHARES
-#ifdef FIX_SHARES
-#warning "ACB: fix share initialization problem [PL #4227]"
+#if 1
+#warning "ACB taking out suspicious early return"
#else
if (! total_pressure)
return;
#else
if (! total_pressure)
return;
@@
-860,10
+859,6
@@
static void adjust_lrq_weight(struct ckrm_cpu_class *clsptr, int cpu_online)
/*give idle class a high share to boost interactiveness */
lw = cpu_class_weight(clsptr);
else {
/*give idle class a high share to boost interactiveness */
lw = cpu_class_weight(clsptr);
else {
-#ifdef FIX_SHARES
- if (! total_pressure)
- return;
-#endif
lw = lrq->lrq_load * class_weight;
do_div(lw,total_pressure);
if (!lw)
lw = lrq->lrq_load * class_weight;
do_div(lw,total_pressure);
if (!lw)
@@
-965,8
+960,6
@@
static int thread_exit = 0;
static int ckrm_cpu_monitord(void *nothing)
{
daemonize("ckrm_cpu_ctrld");
static int ckrm_cpu_monitord(void *nothing)
{
daemonize("ckrm_cpu_ctrld");
- current->flags |= PF_NOFREEZE;
-
for (;;) {
/*sleep for sometime before next try*/
set_current_state(TASK_INTERRUPTIBLE);
for (;;) {
/*sleep for sometime before next try*/
set_current_state(TASK_INTERRUPTIBLE);