diff options
-rw-r--r-- | kernel/sched.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index f8cf78c6af2e..ef6b6bb3e0b2 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -1265,9 +1265,9 @@ static int sched_balance_self(int cpu, int flag) | |||
1265 | struct sched_domain *tmp, *sd = NULL; | 1265 | struct sched_domain *tmp, *sd = NULL; |
1266 | 1266 | ||
1267 | for_each_domain(cpu, tmp) { | 1267 | for_each_domain(cpu, tmp) { |
1268 | /* | 1268 | /* |
1269 | * If power savings logic is enabled for a domain, stop there. | 1269 | * If power savings logic is enabled for a domain, stop there. |
1270 | */ | 1270 | */ |
1271 | if (tmp->flags & SD_POWERSAVINGS_BALANCE) | 1271 | if (tmp->flags & SD_POWERSAVINGS_BALANCE) |
1272 | break; | 1272 | break; |
1273 | if (tmp->flags & flag) | 1273 | if (tmp->flags & flag) |
@@ -1350,9 +1350,9 @@ static int wake_idle(int cpu, struct task_struct *p) | |||
1350 | if (idle_cpu(i)) | 1350 | if (idle_cpu(i)) |
1351 | return i; | 1351 | return i; |
1352 | } | 1352 | } |
1353 | } | 1353 | } else { |
1354 | else | ||
1355 | break; | 1354 | break; |
1355 | } | ||
1356 | } | 1356 | } |
1357 | return cpu; | 1357 | return cpu; |
1358 | } | 1358 | } |
@@ -1702,7 +1702,7 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev) | |||
1702 | /* | 1702 | /* |
1703 | * Remove function-return probe instances associated with this | 1703 | * Remove function-return probe instances associated with this |
1704 | * task and put them back on the free list. | 1704 | * task and put them back on the free list. |
1705 | */ | 1705 | */ |
1706 | kprobe_flush_task(prev); | 1706 | kprobe_flush_task(prev); |
1707 | put_task_struct(prev); | 1707 | put_task_struct(prev); |
1708 | } | 1708 | } |
@@ -5920,6 +5920,7 @@ static int build_sched_domains(const cpumask_t *cpu_map) | |||
5920 | sched_group_nodes[i] = sg; | 5920 | sched_group_nodes[i] = sg; |
5921 | for_each_cpu_mask(j, nodemask) { | 5921 | for_each_cpu_mask(j, nodemask) { |
5922 | struct sched_domain *sd; | 5922 | struct sched_domain *sd; |
5923 | |||
5923 | sd = &per_cpu(node_domains, j); | 5924 | sd = &per_cpu(node_domains, j); |
5924 | sd->groups = sg; | 5925 | sd->groups = sg; |
5925 | } | 5926 | } |