diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-08-29 11:42:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-29 11:42:07 +0200 |
| commit | 416b0c0faf634abc09568885cb95266ce669c606 (patch) | |
| tree | bf63b94f57246fbf264c93bfdd6233395b07ef89 /include/linux/skb_array.h | |
| parent | Merge branch 'x86/asm' into x86/apic (diff) | |
| parent | page waitqueue: always add new entries at the end (diff) | |
Merge branch 'linus' into x86/apic, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/skb_array.h')
| -rw-r--r-- | include/linux/skb_array.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/skb_array.h b/include/linux/skb_array.h index 35226cd4efb0..8621ffdeecbf 100644 --- a/include/linux/skb_array.h +++ b/include/linux/skb_array.h @@ -193,7 +193,8 @@ static inline int skb_array_resize(struct skb_array *a, int size, gfp_t gfp) } static inline int skb_array_resize_multiple(struct skb_array **rings, - int nrings, int size, gfp_t gfp) + int nrings, unsigned int size, + gfp_t gfp) { BUILD_BUG_ON(offsetof(struct skb_array, ring)); return ptr_ring_resize_multiple((struct ptr_ring **)rings, |