diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-02 10:58:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-02 10:58:33 +1000 |
| commit | e8115e79aa62b6ebdb3e8e61ca4092cc32938afc (patch) | |
| tree | 42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19 /include/linux/ring_buffer.h | |
| parent | 9be23ae4350bfd71c0cc2ea3494671ee90e5603b (diff) | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| download | linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.gz linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.bz2 linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.zip | |
Merge tag 'v3.18-rc7' into drm-next
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
Diffstat (limited to 'include/linux/ring_buffer.h')
| -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 49a4d6f59108..e2c13cd863bd 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); \ }) -int ring_buffer_wait(struct ring_buffer *buffer, int cpu); +int ring_buffer_wait(struct ring_buffer *buffer, int cpu, bool full); int ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu, struct file *filp, poll_table *poll_table); |