diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
| commit | 3eb93ea3272d428aab3c03e2dd272a78a7729ba8 (patch) | |
| tree | 63ca8b7e7feccb109f4b5cb868939da395c7632f /include/linux/ptr_ring.h | |
| parent | 5927145efd5de71976e62e2822511b13014d7e56 (diff) | |
| parent | 565977a3d929fc4427769117a8ac976ec16776d5 (diff) | |
Merge branch 'x86/mm' into x86/dma, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/ptr_ring.h')
| -rw-r--r-- | include/linux/ptr_ring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h index b884b7794187..e6335227b844 100644 --- a/include/linux/ptr_ring.h +++ b/include/linux/ptr_ring.h @@ -469,7 +469,7 @@ static inline int ptr_ring_consume_batched_bh(struct ptr_ring *r, */ static inline void **__ptr_ring_init_queue_alloc(unsigned int size, gfp_t gfp) { - if (size * sizeof(void *) > KMALLOC_MAX_SIZE) + if (size > KMALLOC_MAX_SIZE / sizeof(void *)) return NULL; return kvmalloc_array(size, sizeof(void *), gfp | __GFP_ZERO); } |