From: Ingo Molnar <mingo@elte.hu>
The attached (obviously correct) patch re-adds the cleanups to -mm3 that
were lost in the splitup of mm2's sched-ingo-rollup.patch. It comes
straight after the scheduler patches in -mm3:
sched-domain-setup-lock.patch
sched-domain-setup-lock-ppc64-fix.patch
sched-minor-cleanups.patch
sched-inline-removals.patch
sched-move-cold-task.patch
sched-migrate-shortcut.patch
sched-more-sync-wakeups.patch
---
25-akpm/kernel/sched.c | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff -puN kernel/sched.c~sched-cleanups kernel/sched.c
--- 25/kernel/sched.c~sched-cleanups 2004-04-05 18:45:32.463276400 -0700
+++ 25-akpm/kernel/sched.c 2004-04-05 18:45:32.469275488 -0700
@@ -1225,17 +1225,15 @@ static int sched_best_cpu(struct task_st
void sched_balance_exec(void)
{
struct sched_domain *sd, *best_sd = NULL;
- int new_cpu;
- int this_cpu = get_cpu();
+ int new_cpu, this_cpu = get_cpu();
/* Prefer the current CPU if there's only this task running */
if (this_rq()->nr_running <= 1)
goto out;
- for_each_domain(this_cpu, sd) {
+ for_each_domain(this_cpu, sd)
if (sd->flags & SD_BALANCE_EXEC)
best_sd = sd;
- }
if (best_sd) {
new_cpu = sched_best_cpu(current, best_sd);
@@ -1271,7 +1269,7 @@ static void double_lock_balance(runqueue
*/
static inline
void pull_task(runqueue_t *src_rq, prio_array_t *src_array, task_t *p,
- runqueue_t *this_rq, prio_array_t *this_array, int this_cpu)
+ runqueue_t *this_rq, prio_array_t *this_array, int this_cpu)
{
dequeue_task(p, src_array);
src_rq->nr_running--;
@@ -1293,7 +1291,7 @@ void pull_task(runqueue_t *src_rq, prio_
*/
static inline
int can_migrate_task(task_t *p, runqueue_t *rq, int this_cpu,
- struct sched_domain *sd, enum idle_type idle)
+ struct sched_domain *sd, enum idle_type idle)
{
/*
* We do not migrate tasks that are:
@@ -1324,8 +1322,8 @@ int can_migrate_task(task_t *p, runqueue
* Called with both runqueues locked.
*/
static int move_tasks(runqueue_t *this_rq, int this_cpu, runqueue_t *busiest,
- unsigned long max_nr_move, struct sched_domain *sd,
- enum idle_type idle)
+ unsigned long max_nr_move, struct sched_domain *sd,
+ enum idle_type idle)
{
prio_array_t *array, *dst_array;
struct list_head *head, *curr;
@@ -1400,7 +1398,7 @@ out:
*/
static struct sched_group *
find_busiest_group(struct sched_domain *sd, int this_cpu,
- unsigned long *imbalance, enum idle_type idle)
+ unsigned long *imbalance, enum idle_type idle)
{
struct sched_group *busiest = NULL, *this = NULL, *group = sd->groups;
unsigned long max_load, avg_load, total_load, this_load, total_pwr;
@@ -1705,10 +1703,9 @@ static void active_load_balance(runqueue
if (busiest->nr_running <= 1)
return;
- for_each_domain(busiest_cpu, sd) {
+ for_each_domain(busiest_cpu, sd)
if (cpu_isset(busiest->push_cpu, sd->span))
break;
- }
if (!sd) {
WARN_ON(1);
return;
@@ -1723,13 +1720,13 @@ static void active_load_balance(runqueue
do {
cpumask_t tmp;
runqueue_t *rq;
- int push_cpu = 0;
+ int push_cpu = 0;
if (group == busy_group)
goto next_group;
cpus_and(tmp, group->cpumask, cpu_online_map);
- if (cpus_weight(tmp) == 0)
+ if (!cpus_weight(tmp))
goto next_group;
for_each_cpu_mask(i, tmp) {
@@ -1760,7 +1757,7 @@ next_group:
#define CPU_OFFSET(cpu) (HZ * cpu / NR_CPUS)
static void rebalance_tick(int this_cpu, runqueue_t *this_rq,
- enum idle_type idle)
+ enum idle_type idle)
{
unsigned long old_load, this_load;
unsigned long j = jiffies + CPU_OFFSET(this_cpu);
@@ -1782,7 +1779,7 @@ static void rebalance_tick(int this_cpu,
/* scale ms to jiffies */
interval = MSEC_TO_JIFFIES(interval);
- if (unlikely(interval == 0))
+ if (unlikely(!interval))
interval = 1;
if (j - sd->last_balance >= interval) {
@@ -3619,12 +3616,12 @@ void sched_domain_debug(void)
printk(" ");
printk("groups:");
do {
- if (group == NULL) {
+ if (!group) {
printk(" ERROR: NULL");
break;
}
- if (cpus_weight(group->cpumask) == 0)
+ if (!cpus_weight(group->cpumask))
printk(" ERROR empty group:");
cpus_and(tmp, groupmask, group->cpumask);
_