git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: MX3: add SPI devices for mx31lite
[safe/jmp/linux-2.6]
/
kernel
/
sched_idletask.c
diff --git
a/kernel/sched_idletask.c
b/kernel/sched_idletask.c
index
dec4cca
..
b133a28
100644
(file)
--- a/
kernel/sched_idletask.c
+++ b/
kernel/sched_idletask.c
@@
-6,7
+6,7
@@
*/
#ifdef CONFIG_SMP
*/
#ifdef CONFIG_SMP
-static int select_task_rq_idle(struct task_struct *p, int s
ync
)
+static int select_task_rq_idle(struct task_struct *p, int s
d_flag, int flags
)
{
return task_cpu(p); /* IDLE tasks as never migrated */
}
{
return task_cpu(p); /* IDLE tasks as never migrated */
}
@@
-14,7
+14,7
@@
static int select_task_rq_idle(struct task_struct *p, int sync)
/*
* Idle tasks are unconditionally rescheduled:
*/
/*
* Idle tasks are unconditionally rescheduled:
*/
-static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int
sync
)
+static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int
flags
)
{
resched_task(rq->idle);
}
{
resched_task(rq->idle);
}
@@
-22,7
+22,8
@@
static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int sy
static struct task_struct *pick_next_task_idle(struct rq *rq)
{
schedstat_inc(rq, sched_goidle);
static struct task_struct *pick_next_task_idle(struct rq *rq)
{
schedstat_inc(rq, sched_goidle);
-
+ /* adjust the active tasks as we might go into a long sleep */
+ calc_load_account_active(rq);
return rq->idle;
}
return rq->idle;
}
@@
-96,6
+97,11
@@
static void prio_changed_idle(struct rq *rq, struct task_struct *p,
check_preempt_curr(rq, p, 0);
}
check_preempt_curr(rq, p, 0);
}
+unsigned int get_rr_interval_idle(struct task_struct *task)
+{
+ return 0;
+}
+
/*
* Simple, special scheduling class for the per-CPU idle tasks:
*/
/*
* Simple, special scheduling class for the per-CPU idle tasks:
*/
@@
-105,9
+111,6
@@
static const struct sched_class idle_sched_class = {
/* dequeue is not valid, we print a debug message there: */
.dequeue_task = dequeue_task_idle,
/* dequeue is not valid, we print a debug message there: */
.dequeue_task = dequeue_task_idle,
-#ifdef CONFIG_SMP
- .select_task_rq = select_task_rq_idle,
-#endif /* CONFIG_SMP */
.check_preempt_curr = check_preempt_curr_idle,
.check_preempt_curr = check_preempt_curr_idle,
@@
-115,6
+118,8
@@
static const struct sched_class idle_sched_class = {
.put_prev_task = put_prev_task_idle,
#ifdef CONFIG_SMP
.put_prev_task = put_prev_task_idle,
#ifdef CONFIG_SMP
+ .select_task_rq = select_task_rq_idle,
+
.load_balance = load_balance_idle,
.move_one_task = move_one_task_idle,
#endif
.load_balance = load_balance_idle,
.move_one_task = move_one_task_idle,
#endif
@@
-122,6
+127,8
@@
static const struct sched_class idle_sched_class = {
.set_curr_task = set_curr_task_idle,
.task_tick = task_tick_idle,
.set_curr_task = set_curr_task_idle,
.task_tick = task_tick_idle,
+ .get_rr_interval = get_rr_interval_idle,
+
.prio_changed = prio_changed_idle,
.switched_to = switched_to_idle,
.prio_changed = prio_changed_idle,
.switched_to = switched_to_idle,