mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[PATCH] Convert highest_possible_processor_id to nr_cpu_ids
We frequently need the maximum number of possible processors in order to allocate arrays for all processors. So far this was done using highest_possible_processor_id(). However, we do need the number of processors not the highest id. Moreover the number was so far dynamically calculated on each invokation. The number of possible processors does not change when the system is running. We can therefore calculate that number once. Signed-off-by: Christoph Lameter <[email protected]> Cc: Frederik Deweerdt <[email protected]> Cc: Neil Brown <[email protected]> Cc: Trond Myklebust <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
74c7aa8b85
commit
53b8a315b7
5 changed files with 17 additions and 29 deletions
|
|
@ -833,8 +833,7 @@ static int translate_table(char *name, struct ebt_table_info *newinfo)
|
|||
/* this will get free'd in do_replace()/ebt_register_table()
|
||||
if an error occurs */
|
||||
newinfo->chainstack =
|
||||
vmalloc((highest_possible_processor_id()+1)
|
||||
* sizeof(*(newinfo->chainstack)));
|
||||
vmalloc(nr_cpu_ids * sizeof(*(newinfo->chainstack)));
|
||||
if (!newinfo->chainstack)
|
||||
return -ENOMEM;
|
||||
for_each_possible_cpu(i) {
|
||||
|
|
@ -947,8 +946,7 @@ static int do_replace(void __user *user, unsigned int len)
|
|||
if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
|
||||
return -ENOMEM;
|
||||
|
||||
countersize = COUNTER_OFFSET(tmp.nentries) *
|
||||
(highest_possible_processor_id()+1);
|
||||
countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
|
||||
newinfo = vmalloc(sizeof(*newinfo) + countersize);
|
||||
if (!newinfo)
|
||||
return -ENOMEM;
|
||||
|
|
@ -1168,8 +1166,7 @@ int ebt_register_table(struct ebt_table *table)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
countersize = COUNTER_OFFSET(repl->nentries) *
|
||||
(highest_possible_processor_id()+1);
|
||||
countersize = COUNTER_OFFSET(repl->nentries) * nr_cpu_ids;
|
||||
newinfo = vmalloc(sizeof(*newinfo) + countersize);
|
||||
ret = -ENOMEM;
|
||||
if (!newinfo)
|
||||
|
|
|
|||
Loading…
Reference in a new issue