xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rcutorture: Replace multi-instance kzalloc() with kcalloc()

Browse Source 
This commit replaces array-allocation calls to kzalloc() with
equivalent calls to kcalloc().

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
This commit is contained in:
Paul E. McKenney
2017-12-01 14:26:56 -08:00
parent 7928b2cbe5
commit 68a675d433
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/rcu/rcutorture.c
View File

@@ -1557,11 +1557,10 @@ static int rcu_torture_barrier_init(void)
atomic_set(&barrier_cbs_count, 0); atomic_set(&barrier_cbs_count, 0);
atomic_set(&barrier_cbs_invoked, 0); atomic_set(&barrier_cbs_invoked, 0);
barrier_cbs_tasks = barrier_cbs_tasks =
kzalloc(n_barrier_cbs * sizeof(barrier_cbs_tasks[0]), kcalloc(n_barrier_cbs, sizeof(barrier_cbs_tasks[0]),
GFP_KERNEL); GFP_KERNEL);
barrier_cbs_wq = barrier_cbs_wq =
kzalloc(n_barrier_cbs * sizeof(barrier_cbs_wq[0]), kcalloc(n_barrier_cbs, sizeof(barrier_cbs_wq[0]), GFP_KERNEL);
GFP_KERNEL);
if (barrier_cbs_tasks == NULL || !barrier_cbs_wq) if (barrier_cbs_tasks == NULL || !barrier_cbs_wq)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < n_barrier_cbs; i++) { for (i = 0; i < n_barrier_cbs; i++) {
@@ -1799,7 +1798,7 @@ rcu_torture_init(void)
if (firsterr) if (firsterr)
goto unwind; goto unwind;
if (nfakewriters > 0) { if (nfakewriters > 0) {
fakewriter_tasks = kzalloc(nfakewriters * fakewriter_tasks = kcalloc(nfakewriters,
sizeof(fakewriter_tasks[0]), sizeof(fakewriter_tasks[0]),
GFP_KERNEL); GFP_KERNEL);
if (fakewriter_tasks == NULL) { if (fakewriter_tasks == NULL) {
@@ -1814,7 +1813,7 @@ rcu_torture_init(void)
if (firsterr) if (firsterr)
goto unwind; goto unwind;
} }
reader_tasks = kzalloc(nrealreaders * sizeof(reader_tasks[0]), reader_tasks = kcalloc(nrealreaders, sizeof(reader_tasks[0]),
GFP_KERNEL); GFP_KERNEL);
if (reader_tasks == NULL) { if (reader_tasks == NULL) {
VERBOSE_TOROUT_ERRSTRING("out of memory"); VERBOSE_TOROUT_ERRSTRING("out of memory");