From fd25dd0303e81e22b9c31535e8d2d608cf635296 Mon Sep 17 00:00:00 2001 From: Oskar Viljasaar <oskar.viljasaar@iopsys.eu> Date: Tue, 19 Jan 2021 10:47:11 +0100 Subject: [PATCH] Import openwrt hack patch 904-debloat_dma_buf.patch --- drivers/base/Kconfig | 2 +- drivers/dma-buf/Makefile | 10 +++++++--- drivers/dma-buf/dma-buf.c | 4 +++- kernel/sched/core.c | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 3e63a900b3..959c828892 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -172,7 +172,7 @@ config SOC_BUS source "drivers/base/regmap/Kconfig" config DMA_SHARED_BUFFER - bool + tristate default n select ANON_INODES select IRQ_WORK diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile index c33bf88631..723fa1594a 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,3 +1,7 @@ -obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o -obj-$(CONFIG_SYNC_FILE) += sync_file.o -obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o +obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o + +dma-buf-objs-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o +dma-buf-objs-$(CONFIG_SYNC_FILE) += sync_file.o +dma-buf-objs-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o + +dma-shared-buffer-objs := $(dma-buf-objs-y) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 69842145c2..dd098b52f0 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -34,6 +34,7 @@ #include <linux/poll.h> #include <linux/reservation.h> #include <linux/mm.h> +#include <linux/module.h> #include <uapi/linux/dma-buf.h> @@ -1159,4 +1160,5 @@ static void __exit dma_buf_deinit(void) { dma_buf_uninit_debugfs(); } -__exitcall(dma_buf_deinit); +module_exit(dma_buf_deinit); +MODULE_LICENSE("GPL"); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index faef74f632..b84342628b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2129,6 +2129,7 @@ int wake_up_state(struct task_struct *p, unsigned int state) { return try_to_wake_up(p, state, 0); } +EXPORT_SYMBOL_GPL(wake_up_state); /* * Perform scheduler related setup for a newly forked process p. -- GitLab