diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:09:43 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:09:43 +0000 |
commit | f85594f56ffcf05ce971f1e19c8c93795594fb6a (patch) | |
tree | b9f204207e8ea8260ff6971ff511f377cb5e05eb /target/linux/generic/patches-3.18 | |
parent | d917a59014eb8da7f5b2d46a2aba0baced893710 (diff) | |
download | upstream-f85594f56ffcf05ce971f1e19c8c93795594fb6a.tar.gz upstream-f85594f56ffcf05ce971f1e19c8c93795594fb6a.tar.bz2 upstream-f85594f56ffcf05ce971f1e19c8c93795594fb6a.zip |
kernel: fix module load issue in the dma-buf debloat patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48409
Diffstat (limited to 'target/linux/generic/patches-3.18')
-rw-r--r-- | target/linux/generic/patches-3.18/904-debloat_dma_buf.patch | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/904-debloat_dma_buf.patch b/target/linux/generic/patches-3.18/904-debloat_dma_buf.patch index dc6a3b93dc..3faf97a880 100644 --- a/target/linux/generic/patches-3.18/904-debloat_dma_buf.patch +++ b/target/linux/generic/patches-3.18/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 -@@ -904,4 +904,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 *); + +@@ -904,4 +905,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 @@ -1801,6 +1801,7 @@ int wake_up_state(struct task_struct *p, |