cgroup: Add generic cgroup subsystem permission checks.

[linux-2.6.git] / kernel / sched_idletask.c

diff --git a/kernel/sched_idletask.c b/kernel/sched_idletask.c
index 8a21a2e28c13ac2e4620e980888702e22a4f2387..0a51882534eadfea8cb0582c15867aac9c193a26 100644 (file)
--- a/kernel/sched_idletask.c
+++ b/kernel/sched_idletask.c
@@ -6,7 +6,8 @@
  */
 
 #ifdef CONFIG_SMP
-static int select_task_rq_idle(struct task_struct *p, int sync)
+static int
+select_task_rq_idle(struct task_struct *p, int sd_flag, int flags)
 {
        return task_cpu(p); /* IDLE tasks as never migrated */
 }
@@ -14,7 +15,7 @@ static int select_task_rq_idle(struct task_struct *p, int sync)
 /*
  * 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);
 }
@@ -22,7 +23,7 @@ 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);
-
+       calc_load_account_idle(rq);
        return rq->idle;
 }
 
@@ -31,69 +32,40 @@ static struct task_struct *pick_next_task_idle(struct rq *rq)
  * message if some code attempts to do it:
  */
 static void
-dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep)
+dequeue_task_idle(struct rq *rq, struct task_struct *p, int flags)
 {
-       spin_unlock_irq(&rq->lock);
+       raw_spin_unlock_irq(&rq->lock);
        printk(KERN_ERR "bad: scheduling from the idle thread!\n");
        dump_stack();
-       spin_lock_irq(&rq->lock);
+       raw_spin_lock_irq(&rq->lock);
 }
 
 static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
 {
 }
 
-#ifdef CONFIG_SMP
-static unsigned long
-load_balance_idle(struct rq *this_rq, int this_cpu, struct rq *busiest,
-                 unsigned long max_load_move,
-                 struct sched_domain *sd, enum cpu_idle_type idle,
-                 int *all_pinned, int *this_best_prio)
+static void task_tick_idle(struct rq *rq, struct task_struct *curr, int queued)
 {
-       return 0;
 }
 
-static int
-move_one_task_idle(struct rq *this_rq, int this_cpu, struct rq *busiest,
-                  struct sched_domain *sd, enum cpu_idle_type idle)
-{
-       return 0;
-}
-#endif
-
-static void task_tick_idle(struct rq *rq, struct task_struct *curr, int queued)
+static void set_curr_task_idle(struct rq *rq)
 {
 }
 
-static void set_curr_task_idle(struct rq *rq)
+static void switched_to_idle(struct rq *rq, struct task_struct *p)
 {
+       BUG();
 }
 
-static void switched_to_idle(struct rq *rq, struct task_struct *p,
-                            int running)
+static void
+prio_changed_idle(struct rq *rq, struct task_struct *p, int oldprio)
 {
-       /* Can this actually happen?? */
-       if (running)
-               resched_task(rq->curr);
-       else
-               check_preempt_curr(rq, p, 0);
+       BUG();
 }
 
-static void prio_changed_idle(struct rq *rq, struct task_struct *p,
-                             int oldprio, int running)
+static unsigned int get_rr_interval_idle(struct rq *rq, struct task_struct *task)
 {
-       /* This can happen for hot plug CPUS */
-
-       /*
-        * Reschedule if we are currently running on this runqueue and
-        * our priority decreased, or if we are not currently running on
-        * this runqueue and our priority is higher than the current's
-        */
-       if (running) {
-               if (p->prio > oldprio)
-                       resched_task(rq->curr);
-       } else
-               check_preempt_curr(rq, p, 0);
+       return 0;
 }
 
 /*
@@ -113,16 +85,13 @@ static const struct sched_class idle_sched_class = {
 
 #ifdef CONFIG_SMP
        .select_task_rq         = select_task_rq_idle,
-
-       .load_balance           = load_balance_idle,
-       .move_one_task          = move_one_task_idle,
 #endif
 
        .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,
-
-       /* no .task_new for idle tasks */
 };