diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-29 21:06:18 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-29 21:55:42 +0100 |
| commit | d337aab6cc2b544293e2ab2b369a6236ce0c36b7 (patch) | |
| tree | 02f9981b552409bb51753e62d3b1c313e1f57b04 /patches/backport-adjustments | |
| parent | 3d0682d10f44ed81a77066e972111e856e72e916 (diff) | |
backports: refresh on 3.12-rc7v3.12-rc7-1
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.10.17 [ OK ]
19 3.11.6 [ OK ]
20 3.12-rc7 [ OK ]
21 3.2.52 [ OK ]
22 3.3.8 [ OK ]
23 3.4.67 [ OK ]
24 3.5.7 [ OK ]
25 3.6.11 [ OK ]
26 3.7.10 [ OK ]
27 3.8.13 [ OK ]
28 3.9.11 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/backport-adjustments')
| -rw-r--r-- | patches/backport-adjustments/dma-buf.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/backport-adjustments/dma-buf.patch b/patches/backport-adjustments/dma-buf.patch index 88608c09..4afae5f4 100644 --- a/patches/backport-adjustments/dma-buf.patch +++ b/patches/backport-adjustments/dma-buf.patch @@ -1,6 +1,6 @@ --- a/compat/drivers-base-dma-buf.c +++ b/compat/drivers-base-dma-buf.c -@@ -28,6 +28,10 @@ +@@ -27,6 +27,10 @@ #include <linux/dma-buf.h> #include <linux/anon_inodes.h> #include <linux/export.h> @@ -11,7 +11,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> -@@ -180,6 +184,27 @@ struct dma_buf *dma_buf_export_named(voi +@@ -179,6 +183,27 @@ struct dma_buf *dma_buf_export_named(voi } EXPORT_SYMBOL_GPL(dma_buf_export_named); @@ -39,7 +39,7 @@ /** * dma_buf_fd - returns a file descriptor for the given dma_buf -@@ -195,9 +220,10 @@ int dma_buf_fd(struct dma_buf *dmabuf, i +@@ -194,9 +219,10 @@ int dma_buf_fd(struct dma_buf *dmabuf, i if (!dmabuf || !dmabuf->file) return -EINVAL; @@ -51,7 +51,7 @@ fd_install(fd, dmabuf->file); -@@ -725,17 +751,15 @@ static inline void dma_buf_uninit_debugf +@@ -724,17 +750,15 @@ static inline void dma_buf_uninit_debugf } #endif |