kernel: fix module load issue in the dma-buf debloat patch
authorFelix Fietkau <nbd@openwrt.org>
Wed, 20 Jan 2016 20:09:43 +0000 (20:09 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 20 Jan 2016 20:09:43 +0000 (20:09 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48409

target/linux/generic/patches-3.18/904-debloat_dma_buf.patch
target/linux/generic/patches-4.1/904-debloat_dma_buf.patch
target/linux/generic/patches-4.3/904-debloat_dma_buf.patch
target/linux/generic/patches-4.4/904-debloat_dma_buf.patch

index dc6a3b93dcd7a8fd6312291d23f7830ac09ab728..3faf97a880206d9e3c95abc277079c50d7c5977e 100644 (file)
 +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,
index b14e1d2e9d705db8f4b9f506a4d686aa99bc342a..9fffa19766cb703e577c18f13476298e5a55aa36 100644 (file)
 +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,
index a47c7a8ad245c9edcc92f459b93c3d6a85aa65ba..66688b0d94a7c083bfd2c7a207d985fdef437a5d 100644 (file)
 +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,
index e7b7f724421b34d8397c43d0b6967d70c1454f8f..3766ceacb7c3b7d72c909bbbbb3dd627b23aa916 100644 (file)
 +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,