diff options
| author |   Mark Brown <broonie@kernel.org> | 2017-09-19 14:12:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-19 14:12:47 +0100 |
| commit | e9331ee9b164d58b4dd0abc882ba7e23d2f404b3 (patch) | |
| tree | 903d078e53a59ed65708193f2486ad0b9a8109d8 /include/linux/skb_array.h | |
| parent | ASoC: rockchip: Add dapm route for HDMI (diff) | |
| parent | Linux 4.14-rc1 (diff) | |
Merge tag 'v4.14-rc1' into asoc-rockchip
Linux 4.14-rc1
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, |