hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sched/cpupri: Replace NR_CPUS arrays 

Tejun reported that his resume was failing due to order-3 allocations
from sched_domain building.

Replace the NR_CPUS arrays in there with a dynamically allocated
array.

Reported-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/n/tip-7cysnkw1gik45r864t1nkudh@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2014-05-14 16:04:26 +02:00 committed by Ingo Molnar
parent 944770ab54
commit 4dac0b6383
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/sched/cpupri.c
View File

@ -30,6 +30,7 @@
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/sched/rt.h> #include <linux/sched/rt.h>
#include <linux/slab.h>
#include "cpupri.h" #include "cpupri.h"
/* Convert between a 140 based task->prio, and our 102 based cpupri */ /* Convert between a 140 based task->prio, and our 102 based cpupri */
@ -218,8 +219,13 @@ int cpupri_init(struct cpupri *cp)
goto cleanup; goto cleanup;
} }
cp->cpu_to_pri = kcalloc(nr_cpu_ids, sizeof(int), GFP_KERNEL);
if (!cp->cpu_to_pri)
goto cleanup;
for_each_possible_cpu(i) for_each_possible_cpu(i)
cp->cpu_to_pri[i] = CPUPRI_INVALID; cp->cpu_to_pri[i] = CPUPRI_INVALID;
return 0; return 0;
cleanup: cleanup:
@ -236,6 +242,7 @@ void cpupri_cleanup(struct cpupri *cp)
{ {
int i; int i;
kfree(cp->cpu_to_pri);
for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) for (i = 0; i < CPUPRI_NR_PRIORITIES; i++)
free_cpumask_var(cp->pri_to_cpu[i].mask); free_cpumask_var(cp->pri_to_cpu[i].mask);
} }

2
kernel/sched/cpupri.h
View File

@ -17,7 +17,7 @@ struct cpupri_vec {
struct cpupri { struct cpupri {
struct cpupri_vec pri_to_cpu[CPUPRI_NR_PRIORITIES]; struct cpupri_vec pri_to_cpu[CPUPRI_NR_PRIORITIES];
int cpu_to_pri[NR_CPUS]; int *cpu_to_pri;
}; };
#ifdef CONFIG_SMP #ifdef CONFIG_SMP