diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-07-18 14:06:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-18 14:08:02 +0800 |
| commit | d0bc082b9c9d792a65e062856eb559b534d81fd8 (patch) | |
| tree | 1491c8cb1d65e4fe21aeaa73fb8035b68c357348 /include | |
| parent | fa6e05294759c29b3736010aa386928d24715feb (diff) | |
| parent | d02dae430d1f41f2c1dc8592f68569f90b86f6d9 (diff) | |
Merge tag 'v3.10.49' into linux-linaro-lsk
This is the 3.10.49 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ring_buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index d69cf637a15a..49a4d6f59108 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -97,7 +97,7 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k __ring_buffer_alloc((size), (flags), &__key); \ }) -void ring_buffer_wait(struct ring_buffer *buffer, int cpu); +int ring_buffer_wait(struct ring_buffer *buffer, int cpu); int ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu, struct file *filp, poll_table *poll_table); |