Permalink
Browse files

Merge branch 'bld-3.5' into pf-3.5

  • Loading branch information...
2 parents f6f3412 + d90e6ee commit 91fc53c9735c8c941d683c65356e5c4e682081f9 Oleksandr Natalenko committed Aug 5, 2012
Showing with 3 additions and 4 deletions.
  1. +1 −2 kernel/sched/bld.h
  2. +2 −2 kernel/sched/core.c
View
@@ -30,7 +30,6 @@ static inline int select_cpu_for_wakeup(struct task_struct *p, int sd_flags, int
static int bld_select_task_rq(struct task_struct *p, int sd_flags, int wake_flags)
{
struct rq *tmp, *rq;
- unsigned long flag;
unsigned int cpu = smp_processor_id();
if (&p->cpus_allowed) {
@@ -86,7 +85,7 @@ static void bld_track_load_deactivate(struct rq *rq)
if (rq->load.weight <= first->load.weight) {
write_lock_irqsave(&disp_list_lock, flag);
list_del(&rq->disp_load_balance);
- list_add_tail(&rq->disp_load_balance, &rq_head);
+ list_add(&rq->disp_load_balance, &rq_head);
rq->pos = 0; first->pos = 1;
write_unlock_irqrestore(&disp_list_lock, flag);
}
View
@@ -555,6 +555,7 @@ void resched_cpu(int cpu)
int get_nohz_timer_target(void)
{
int cpu = smp_processor_id();
+#ifndef CONFIG_BLD
int i;
struct sched_domain *sd;
@@ -569,6 +570,7 @@ int get_nohz_timer_target(void)
}
unlock:
rcu_read_unlock();
+#endif
return cpu;
}
/*
@@ -2469,7 +2471,6 @@ calc_load_n(unsigned long load, unsigned long exp,
*/
static void calc_global_nohz(void)
{
-#ifndef CONFIG_BLD
long delta, active, n;
if (!time_before(jiffies, calc_load_update + 10)) {
@@ -2498,7 +2499,6 @@ static void calc_global_nohz(void)
*/
smp_wmb();
calc_load_idx++;
-#endif
}
#else /* !CONFIG_NO_HZ */

0 comments on commit 91fc53c

Please sign in to comment.