summaryrefslogtreecommitdiff
path: root/patches/backport-adjustments
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-24 21:58:39 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-24 23:01:36 +0200
commita3970e75ec215fc03f1edab5fa3a663bceae1812 (patch)
tree1a0d34b955daf66fe16fecc58dc02b126de3f1b0 /patches/backport-adjustments
parentec4ca3eb6c30817904279ccf1e2e1c2fc4dd277f (diff)
backports: refresh on next-20130927backports-20130927
== ckmake-report.log == 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.98 [ OK ] 17 3.1.10 [ OK ] 18 3.10.14 [ OK ] 19 3.11.3 [ OK ] 20 3.12-rc3 [ OK ] 21 3.2.51 [ OK ] 22 3.3.8 [ OK ] 23 3.4.64 [ 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.patch8
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