aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-20 20:09:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-20 20:09:43 +0000
commita8d03f45ce0efdb97a585d402a1dc9fe8436c2ff (patch)
treed8134c52b8530e18beb2ff65dcf2453b8ca6ec4f /target/linux/generic/patches-4.1/904-debloat_dma_buf.patch
parent771ba61cfb388ec03e281a36c3fd685f111a5d9c (diff)
downloadmaster-187ad058-a8d03f45ce0efdb97a585d402a1dc9fe8436c2ff.tar.gz
master-187ad058-a8d03f45ce0efdb97a585d402a1dc9fe8436c2ff.tar.bz2
master-187ad058-a8d03f45ce0efdb97a585d402a1dc9fe8436c2ff.zip
kernel: fix module load issue in the dma-buf debloat patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48409 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/904-debloat_dma_buf.patch')
-rw-r--r--target/linux/generic/patches-4.1/904-debloat_dma_buf.patch11
1 files changed, 10 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch b/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch
index b14e1d2e9d..9fffa19766 100644
--- a/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch
+++ b/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch
@@ -17,12 +17,21 @@
+dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
-@@ -901,4 +901,4 @@ static void __exit dma_buf_deinit(void)
+@@ -32,6 +32,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/poll.h>
+ #include <linux/reservation.h>
++#include <linux/module.h>
+
+ static inline int is_dma_buf_file(struct file *);
+
+@@ -901,4 +902,5 @@ static void __exit dma_buf_deinit(void)
{
dma_buf_uninit_debugfs();
}
-__exitcall(dma_buf_deinit);
+module_exit(dma_buf_deinit);
++MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1768,6 +1768,7 @@ int wake_up_state(struct task_struct *p,