From 5133c858f16f14c0d162a724e6b26a77bc33508f Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Jul 2007 18:52:00 +0200
Subject: [PATCH] --- yaml --- r: 58303 b: refs/heads/master c:
 9761eea8516d1ff2c7b185e283c5d81cfc307acb h: refs/heads/master i:   58301:
 2393e640405734dfd70f1fb7085bef53bee2fd21   58299:
 3eeb84201a348d04bd987f1c476b88622a47ebd5   58295:
 c8c90e997033a54909abfd43fc1722163d984234   58287:
 fe2375f5731f9282cb5b183ec5b82e7e53bd4b49   58271:
 fa36a9d5fb5abc82b415d5f2251116d5a9af1583   58239:
 4262ba0ae16539f576d80b5bfa053bae56e45131 v: v3

---
 [refs]               |  2 +-
 trunk/kernel/sched.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 703218c639e7..bf421566f162 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23bdd703a585a869f2eb32fb9f66749d0476d71e
+refs/heads/master: 9761eea8516d1ff2c7b185e283c5d81cfc307acb
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index f8cf78c6af2e..ef6b6bb3e0b2 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1265,9 +1265,9 @@ static int sched_balance_self(int cpu, int flag)
 	struct sched_domain *tmp, *sd = NULL;
 
 	for_each_domain(cpu, tmp) {
- 		/*
- 	 	 * If power savings logic is enabled for a domain, stop there.
- 	 	 */
+		/*
+		 * If power savings logic is enabled for a domain, stop there.
+		 */
 		if (tmp->flags & SD_POWERSAVINGS_BALANCE)
 			break;
 		if (tmp->flags & flag)
@@ -1350,9 +1350,9 @@ static int wake_idle(int cpu, struct task_struct *p)
 				if (idle_cpu(i))
 					return i;
 			}
-		}
-		else
+		} else {
 			break;
+		}
 	}
 	return cpu;
 }
@@ -1702,7 +1702,7 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
 		/*
 		 * Remove function-return probe instances associated with this
 		 * task and put them back on the free list.
-	 	 */
+		 */
 		kprobe_flush_task(prev);
 		put_task_struct(prev);
 	}
@@ -5920,6 +5920,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
 		sched_group_nodes[i] = sg;
 		for_each_cpu_mask(j, nodemask) {
 			struct sched_domain *sd;
+
 			sd = &per_cpu(node_domains, j);
 			sd->groups = sg;
 		}