]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ALSA: seq: Use kvmalloc() for cell pools
authorTakashi Iwai <tiwai@suse.de>
Thu, 28 Mar 2019 15:09:45 +0000 (16:09 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 9 Apr 2019 15:22:46 +0000 (17:22 +0200)
Use kvmalloc() for allocating cell pools since the pool size can be
relatively small that may be covered better by slab.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/seq/seq_memory.c

index 5b0388202bac5b2acee81d87ce3d819934a27021..6ea4d8a5a71e72f65e5e655b9b3eb6fc4988dfe9 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/sched/signal.h>
-#include <linux/vmalloc.h>
+#include <linux/mm.h>
 #include <sound/core.h>
 
 #include <sound/seq_kernel.h>
@@ -389,8 +389,8 @@ int snd_seq_pool_init(struct snd_seq_pool *pool)
        if (snd_BUG_ON(!pool))
                return -EINVAL;
 
-       cellptr = vmalloc(array_size(sizeof(struct snd_seq_event_cell),
-                                    pool->size));
+       cellptr = kvmalloc_array(sizeof(struct snd_seq_event_cell), pool->size,
+                                GFP_KERNEL);
        if (!cellptr)
                return -ENOMEM;
 
@@ -398,7 +398,7 @@ int snd_seq_pool_init(struct snd_seq_pool *pool)
        spin_lock_irqsave(&pool->lock, flags);
        if (pool->ptr) {
                spin_unlock_irqrestore(&pool->lock, flags);
-               vfree(cellptr);
+               kvfree(cellptr);
                return 0;
        }
 
@@ -456,7 +456,7 @@ int snd_seq_pool_done(struct snd_seq_pool *pool)
        pool->total_elements = 0;
        spin_unlock_irqrestore(&pool->lock, flags);
 
-       vfree(ptr);
+       kvfree(ptr);
 
        spin_lock_irqsave(&pool->lock, flags);
        pool->closing = 0;