diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-14 23:37:42 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-14 23:37:42 -0700 |
| commit | a331cebc0a1411faba1acf369a8c97255da7e11c (patch) | |
| tree | 324d332ffcfbbc230a5e664062f0847ec9d0d93a /0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch | |
| parent | 5daf3a9d2ab9dfd7fe1fb7c48453e04473c6bb59 (diff) | |
| download | patches-a331cebc0a1411faba1acf369a8c97255da7e11c.tar.gz | |
patch refresh and drop after 4.14-rc1 merge
Also added a new patch.
Diffstat (limited to '0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch')
| -rw-r--r-- | 0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch b/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch index 67a6fa912e94ef..5540af403407aa 100644 --- a/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch +++ b/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch @@ -42,7 +42,7 @@ Signed-off-by: Jin Qian <jinqian@android.com> --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c -@@ -334,8 +334,12 @@ dma_fence_remove_callback(struct dma_fen +@@ -329,8 +329,12 @@ dma_fence_remove_callback(struct dma_fen spin_lock_irqsave(fence->lock, flags); ret = !list_empty(&cb->node); @@ -58,7 +58,7 @@ Signed-off-by: Jin Qian <jinqian@android.com> --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h -@@ -109,6 +109,7 @@ struct dma_fence_cb { +@@ -111,6 +111,7 @@ struct dma_fence_cb { * @get_driver_name: returns the driver name. * @get_timeline_name: return the name of the context this fence belongs to. * @enable_signaling: enable software signaling of fence. @@ -66,7 +66,7 @@ Signed-off-by: Jin Qian <jinqian@android.com> * @signaled: [optional] peek whether the fence is signaled, can be null. * @wait: custom wait implementation, or dma_fence_default_wait. * @release: [optional] called on destruction of fence, can be null -@@ -168,6 +169,7 @@ struct dma_fence_ops { +@@ -170,6 +171,7 @@ struct dma_fence_ops { const char * (*get_driver_name)(struct dma_fence *fence); const char * (*get_timeline_name)(struct dma_fence *fence); bool (*enable_signaling)(struct dma_fence *fence); |