git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
kernel
/
sched
/
fair.c
diff --git
a/kernel/sched/fair.c
b/kernel/sched/fair.c
index b78280c59b4693d9a546d639a702c7c8d64eff89..0b069bf3e708e82ea0e08c5b204f931ca1d22a00 100644
(file)
--- a/
kernel/sched/fair.c
+++ b/
kernel/sched/fair.c
@@
-6615,7
+6615,7
@@
static int load_balance(int this_cpu, struct rq *this_rq,
struct sched_group *group;
struct rq *busiest;
unsigned long flags;
- struct cpumask *cpus =
__get_cpu_va
r(load_balance_mask);
+ struct cpumask *cpus =
this_cpu_cpumask_var_pt
r(load_balance_mask);
struct lb_env env = {
.sd = sd,