diff options
Diffstat (limited to 'kernel/rcu')
| -rw-r--r-- | kernel/rcu/rcuscale.c | 6 | ||||
| -rw-r--r-- | kernel/rcu/rcutorture.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/kernel/rcu/rcuscale.c b/kernel/rcu/rcuscale.c index 6c1acf9ba69b..16adcbecf875 100644 --- a/kernel/rcu/rcuscale.c +++ b/kernel/rcu/rcuscale.c @@ -755,8 +755,7 @@ kfree_scale_thread(void *arg) } for (i = 0; i < kfree_alloc_num; i++) { - alloc_ptr = kzalloc_objs(struct kfree_obj, kfree_mult, - GFP_KERNEL); + alloc_ptr = kzalloc_objs(struct kfree_obj, kfree_mult); if (!alloc_ptr) return -ENOMEM; @@ -1146,8 +1145,7 @@ rcu_scale_init(void) schedule_timeout_uninterruptible(1); writer_tasks = kzalloc_objs(writer_tasks[0], nrealwriters); writer_durations = kcalloc(nrealwriters, sizeof(*writer_durations), GFP_KERNEL); - writer_n_durations = kzalloc_objs(*writer_n_durations, nrealwriters, - GFP_KERNEL); + writer_n_durations = kzalloc_objs(*writer_n_durations, nrealwriters); writer_done = kzalloc_objs(writer_done[0], nrealwriters); if (gp_async) { if (gp_async_max <= 0) { diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 197cea4d1f26..9279bb57586b 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -4592,8 +4592,7 @@ rcu_torture_init(void) if (WARN_ON(nocbs_toggle < 0)) nocbs_toggle = HZ; if (nrealnocbers > 0) { - nocb_tasks = kzalloc_objs(nocb_tasks[0], nrealnocbers, - GFP_KERNEL); + nocb_tasks = kzalloc_objs(nocb_tasks[0], nrealnocbers); if (nocb_tasks == NULL) { TOROUT_ERRSTRING("out of memory"); firsterr = -ENOMEM; |