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 | a8d03f45ce0efdb97a585d402a1dc9fe8436c2ff (patch) | |
| tree | d8134c52b8530e18beb2ff65dcf2453b8ca6ec4f | |
| parent | 771ba61cfb388ec03e281a36c3fd685f111a5d9c (diff) | |
| download | master-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
4 files changed, 40 insertions, 4 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, 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, diff --git a/target/linux/generic/patches-4.3/904-debloat_dma_buf.patch b/target/linux/generic/patches-4.3/904-debloat_dma_buf.patch index a47c7a8ad2..66688b0d94 100644 --- a/target/linux/generic/patches-4.3/904-debloat_dma_buf.patch +++ b/target/linux/generic/patches-4.3/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 -@@ -914,4 +914,4 @@ static void __exit dma_buf_deinit(void) +@@ -33,6 +33,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 *); + +@@ -914,4 +915,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 @@ -2040,6 +2040,7 @@ int wake_up_state(struct task_struct *p, diff --git a/target/linux/generic/patches-4.4/904-debloat_dma_buf.patch b/target/linux/generic/patches-4.4/904-debloat_dma_buf.patch index e7b7f72442..3766ceacb7 100644 --- a/target/linux/generic/patches-4.4/904-debloat_dma_buf.patch +++ b/target/linux/generic/patches-4.4/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 -@@ -914,4 +914,4 @@ static void __exit dma_buf_deinit(void) +@@ -33,6 +33,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 *); + +@@ -914,4 +915,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 @@ -2072,6 +2072,7 @@ int wake_up_state(struct task_struct *p, |