kernel: bump 5.4 to 5.4.105
[openwrt/openwrt.git] / target / linux / generic / hack-5.4 / 904-debloat_dma_buf.patch
1 From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001
2 From: Felix Fietkau <nbd@nbd.name>
3 Date: Sat, 8 Jul 2017 08:20:43 +0200
4 Subject: debloat: dmabuf
5
6 Signed-off-by: Felix Fietkau <nbd@nbd.name>
7 ---
8 drivers/base/Kconfig | 2 +-
9 drivers/dma-buf/Makefile | 10 +++++++---
10 drivers/dma-buf/dma-buf.c | 4 +++-
11 kernel/sched/core.c | 1 +
12 4 files changed, 12 insertions(+), 5 deletions(-)
13
14 --- a/drivers/base/Kconfig
15 +++ b/drivers/base/Kconfig
16 @@ -179,7 +179,7 @@ config SOC_BUS
17 source "drivers/base/regmap/Kconfig"
18
19 config DMA_SHARED_BUFFER
20 - bool
21 + tristate
22 default n
23 select IRQ_WORK
24 help
25 --- a/drivers/dma-buf/Makefile
26 +++ b/drivers/dma-buf/Makefile
27 @@ -1,9 +1,13 @@
28 # SPDX-License-Identifier: GPL-2.0-only
29 -obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
30 - dma-resv.o seqno-fence.o
31 -obj-$(CONFIG_SYNC_FILE) += sync_file.o
32 -obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o
33 -obj-$(CONFIG_UDMABUF) += udmabuf.o
34 +obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o
35 +
36 +dma-buf-objs-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
37 + dma-resv.o seqno-fence.o
38 +dma-buf-objs-$(CONFIG_SYNC_FILE) += sync_file.o
39 +dma-buf-objs-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o
40 +dma-buf-objs-$(CONFIG_UDMABUF) += udmabuf.o
41 +
42 +dma-shared-buffer-objs := $(dma-buf-objs-y)
43
44 dmabuf_selftests-y := \
45 selftest.o \
46 --- a/drivers/dma-buf/dma-buf.c
47 +++ b/drivers/dma-buf/dma-buf.c
48 @@ -1313,4 +1313,5 @@ static void __exit dma_buf_deinit(void)
49 dma_buf_uninit_debugfs();
50 kern_unmount(dma_buf_mnt);
51 }
52 -__exitcall(dma_buf_deinit);
53 +module_exit(dma_buf_deinit);
54 +MODULE_LICENSE("GPL");
55 --- a/kernel/sched/core.c
56 +++ b/kernel/sched/core.c
57 @@ -2754,6 +2754,7 @@ int wake_up_state(struct task_struct *p,
58 {
59 return try_to_wake_up(p, state, 0);
60 }
61 +EXPORT_SYMBOL_GPL(wake_up_state);
62
63 /*
64 * Perform scheduler related setup for a newly forked process p.
65 --- a/fs/d_path.c
66 +++ b/fs/d_path.c
67 @@ -311,6 +311,7 @@ char *dynamic_dname(struct dentry *dentr
68 buffer += buflen - sz;
69 return memcpy(buffer, temp, sz);
70 }
71 +EXPORT_SYMBOL_GPL(dynamic_dname);
72
73 char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
74 {