diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:27:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:27:08 +0000 |
| commit | e404b824d61267ae5e63cf5603bc51f84e720d95 (patch) | |
| tree | cc36025ab6c0b4528e399670a305561e4e7a57a2 | |
| parent | ed9632da9a07c3de48caaef854cd30999f46272d (diff) | |
| download | upstream-e404b824d61267ae5e63cf5603bc51f84e720d95.tar.gz upstream-e404b824d61267ae5e63cf5603bc51f84e720d95.tar.bz2 upstream-e404b824d61267ae5e63cf5603bc51f84e720d95.zip | |
kernel: fix module load issue in the dma-buf debloat patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r48409
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48411 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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, |