From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 20 Jan 2016 20:09:43 +0000 (+0000)
Subject: kernel: fix module load issue in the dma-buf debloat patch
X-Git-Tag: reboot~722
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f85594f56ffcf05ce971f1e19c8c93795594fb6a;p=oweals%2Fopenwrt.git

kernel: fix module load issue in the dma-buf debloat patch

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48409
---

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,