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

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

SVN-Revision: 48409
This commit is contained in:
Felix Fietkau 2016-01-20 20:09:43 +00:00
parent d917a59014
commit f85594f56f
4 changed files with 40 additions and 4 deletions

View file

@ -17,12 +17,21 @@
+dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o +dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o
--- a/drivers/dma-buf/dma-buf.c --- a/drivers/dma-buf/dma-buf.c
+++ b/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(); dma_buf_uninit_debugfs();
} }
-__exitcall(dma_buf_deinit); -__exitcall(dma_buf_deinit);
+module_exit(dma_buf_deinit); +module_exit(dma_buf_deinit);
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -1801,6 +1801,7 @@ int wake_up_state(struct task_struct *p, @@ -1801,6 +1801,7 @@ int wake_up_state(struct task_struct *p,

View file

@ -17,12 +17,21 @@
+dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o +dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o
--- a/drivers/dma-buf/dma-buf.c --- a/drivers/dma-buf/dma-buf.c
+++ b/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(); dma_buf_uninit_debugfs();
} }
-__exitcall(dma_buf_deinit); -__exitcall(dma_buf_deinit);
+module_exit(dma_buf_deinit); +module_exit(dma_buf_deinit);
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -1768,6 +1768,7 @@ int wake_up_state(struct task_struct *p, @@ -1768,6 +1768,7 @@ int wake_up_state(struct task_struct *p,

View file

@ -17,12 +17,21 @@
+dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o +dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o
--- a/drivers/dma-buf/dma-buf.c --- a/drivers/dma-buf/dma-buf.c
+++ b/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(); dma_buf_uninit_debugfs();
} }
-__exitcall(dma_buf_deinit); -__exitcall(dma_buf_deinit);
+module_exit(dma_buf_deinit); +module_exit(dma_buf_deinit);
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -2040,6 +2040,7 @@ int wake_up_state(struct task_struct *p, @@ -2040,6 +2040,7 @@ int wake_up_state(struct task_struct *p,

View file

@ -17,12 +17,21 @@
+dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o +dma-shared-buffer-objs := dma-buf.o fence.o reservation.o seqno-fence.o
--- a/drivers/dma-buf/dma-buf.c --- a/drivers/dma-buf/dma-buf.c
+++ b/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(); dma_buf_uninit_debugfs();
} }
-__exitcall(dma_buf_deinit); -__exitcall(dma_buf_deinit);
+module_exit(dma_buf_deinit); +module_exit(dma_buf_deinit);
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -2072,6 +2072,7 @@ int wake_up_state(struct task_struct *p, @@ -2072,6 +2072,7 @@ int wake_up_state(struct task_struct *p,