diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:25:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:25:07 +0100 |
| commit | 4c8ee71620d734c8ad129fad085167f56f9ce351 (patch) | |
| tree | 87208b0144aa664c96dd8b43bbcaaf1f25af606b /kernel/sched/fair.c | |
| parent | locking/drm: Fix i915_gem_shrinker_lock() locking (diff) | |
| parent | Merge tag 'sound-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| download | linux-4c8ee71620d734c8ad129fad085167f56f9ce351.tar.xz linux-4c8ee71620d734c8ad129fad085167f56f9ce351.zip | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d941c97dfbc3..c242944f5cbd 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8839,7 +8839,6 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) { struct sched_entity *se; struct cfs_rq *cfs_rq; - struct rq *rq; int i; tg->cfs_rq = kzalloc(sizeof(cfs_rq) * nr_cpu_ids, GFP_KERNEL); @@ -8854,8 +8853,6 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) init_cfs_bandwidth(tg_cfs_bandwidth(tg)); for_each_possible_cpu(i) { - rq = cpu_rq(i); - cfs_rq = kzalloc_node(sizeof(struct cfs_rq), GFP_KERNEL, cpu_to_node(i)); if (!cfs_rq) |