2016-01-19 21:09:11 +00:00
|
|
|
--- a/drivers/base/Kconfig
|
|
|
|
|
+++ b/drivers/base/Kconfig
|
|
|
|
|
@@ -229,7 +229,7 @@ config SOC_BUS
|
|
|
|
|
source "drivers/base/regmap/Kconfig"
|
|
|
|
|
|
|
|
|
|
config DMA_SHARED_BUFFER
|
|
|
|
|
- bool
|
|
|
|
|
+ tristate
|
|
|
|
|
default n
|
|
|
|
|
select ANON_INODES
|
|
|
|
|
help
|
|
|
|
|
--- a/drivers/dma-buf/Makefile
|
|
|
|
|
+++ b/drivers/dma-buf/Makefile
|
|
|
|
|
@@ -1 +1,2 @@
|
|
|
|
|
-obj-y := dma-buf.o fence.o reservation.o seqno-fence.o
|
|
|
|
|
+obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o
|
|
|
|
|
+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
|
2016-01-20 20:09:43 +00:00
|
|
|
@@ -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)
|
2016-01-19 21:09:11 +00:00
|
|
|
{
|
|
|
|
|
dma_buf_uninit_debugfs();
|
|
|
|
|
}
|
|
|
|
|
-__exitcall(dma_buf_deinit);
|
|
|
|
|
+module_exit(dma_buf_deinit);
|
2016-01-20 20:09:43 +00:00
|
|
|
+MODULE_LICENSE("GPL");
|
2016-01-19 21:09:11 +00:00
|
|
|
--- a/kernel/sched/core.c
|
|
|
|
|
+++ b/kernel/sched/core.c
|
2016-09-15 13:27:45 +00:00
|
|
|
@@ -1790,6 +1790,7 @@ int wake_up_state(struct task_struct *p,
|
2016-01-19 21:09:11 +00:00
|
|
|
{
|
|
|
|
|
return try_to_wake_up(p, state, 0);
|
|
|
|
|
}
|
|
|
|
|
+EXPORT_SYMBOL_GPL(wake_up_state);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This function clears the sched_dl_entity static params.
|
