diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
| commit | 7f36522fa5c8192dccee0f0a414f1b7b336b9c87 (patch) | |
| tree | 443ab002a359443792f43c48790e91539a01e4d4 /net/ipv6/ila/ila_xlat.c | |
| parent | bab31490ee78b5c5531bae6d54d411a49d2c2f30 (diff) | |
| parent | 28415881a8fced951563443d0a95f9f14cea8687 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'net/ipv6/ila/ila_xlat.c')
| -rw-r--r-- | net/ipv6/ila/ila_xlat.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c index af8f52ee7180..2fd5ca151dcf 100644 --- a/net/ipv6/ila/ila_xlat.c +++ b/net/ipv6/ila/ila_xlat.c @@ -41,13 +41,7 @@ static int alloc_ila_locks(struct ila_net *ilan) size = roundup_pow_of_two(nr_pcpus * LOCKS_PER_CPU); if (sizeof(spinlock_t) != 0) { -#ifdef CONFIG_NUMA - if (size * sizeof(spinlock_t) > PAGE_SIZE) - ilan->locks = vmalloc(size * sizeof(spinlock_t)); - else -#endif - ilan->locks = kmalloc_array(size, sizeof(spinlock_t), - GFP_KERNEL); + ilan->locks = kvmalloc(size * sizeof(spinlock_t), GFP_KERNEL); if (!ilan->locks) return -ENOMEM; for (i = 0; i < size; i++) |