Author: nbd Date: 2016-01-20 21:09:43 +0100 (Wed, 20 Jan 2016) New Revision: 48409
Modified: trunk/target/linux/generic/patches-3.18/904-debloat_dma_buf.patch trunk/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch trunk/target/linux/generic/patches-4.3/904-debloat_dma_buf.patch trunk/target/linux/generic/patches-4.4/904-debloat_dma_buf.patch Log: kernel: fix module load issue in the dma-buf debloat patch Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/target/linux/generic/patches-3.18/904-debloat_dma_buf.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/904-debloat_dma_buf.patch 2016-01-20 19:36:23 UTC (rev 48408) +++ trunk/target/linux/generic/patches-3.18/904-debloat_dma_buf.patch 2016-01-20 20:09:43 UTC (rev 48409) @@ -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, Modified: trunk/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch 2016-01-20 19:36:23 UTC (rev 48408) +++ trunk/target/linux/generic/patches-4.1/904-debloat_dma_buf.patch 2016-01-20 20:09:43 UTC (rev 48409) @@ -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, Modified: trunk/target/linux/generic/patches-4.3/904-debloat_dma_buf.patch =================================================================== --- trunk/target/linux/generic/patches-4.3/904-debloat_dma_buf.patch 2016-01-20 19:36:23 UTC (rev 48408) +++ trunk/target/linux/generic/patches-4.3/904-debloat_dma_buf.patch 2016-01-20 20:09:43 UTC (rev 48409) @@ -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, Modified: trunk/target/linux/generic/patches-4.4/904-debloat_dma_buf.patch =================================================================== --- trunk/target/linux/generic/patches-4.4/904-debloat_dma_buf.patch 2016-01-20 19:36:23 UTC (rev 48408) +++ trunk/target/linux/generic/patches-4.4/904-debloat_dma_buf.patch 2016-01-20 20:09:43 UTC (rev 48409) @@ -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, _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
