mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
88068dd767
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.103 Removed upstreamed: generic/backport-6.1/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch See: See: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.103&id=c6c419ed94788ca13334b4acd50167b7f6d00a06 All other patches automatically rebased. Build system: bcm4908 bcm53xx Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16093 Signed-off-by: Robert Marko <robimarko@gmail.com>
94 lines
2.9 KiB
Diff
94 lines
2.9 KiB
Diff
From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Sat, 8 Jul 2017 08:20:43 +0200
|
|
Subject: debloat: dmabuf
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
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(-)
|
|
|
|
--- a/drivers/base/Kconfig
|
|
+++ b/drivers/base/Kconfig
|
|
@@ -198,7 +198,7 @@ config SOC_BUS
|
|
source "drivers/base/regmap/Kconfig"
|
|
|
|
config DMA_SHARED_BUFFER
|
|
- bool
|
|
+ tristate
|
|
default n
|
|
select IRQ_WORK
|
|
help
|
|
--- a/drivers/dma-buf/heaps/Makefile
|
|
+++ b/drivers/dma-buf/heaps/Makefile
|
|
@@ -1,3 +1,3 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
-obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
|
|
-obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o
|
|
+dma-buf-objs-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
|
|
+dma-buf-objs-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o
|
|
--- a/drivers/dma-buf/Makefile
|
|
+++ b/drivers/dma-buf/Makefile
|
|
@@ -1,12 +1,14 @@
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
-obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
|
|
+obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o
|
|
+
|
|
+dma-buf-objs-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
|
|
dma-fence-unwrap.o dma-resv.o
|
|
-obj-$(CONFIG_DMABUF_HEAPS) += dma-heap.o
|
|
-obj-$(CONFIG_DMABUF_HEAPS) += heaps/
|
|
-obj-$(CONFIG_SYNC_FILE) += sync_file.o
|
|
-obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o
|
|
-obj-$(CONFIG_UDMABUF) += udmabuf.o
|
|
-obj-$(CONFIG_DMABUF_SYSFS_STATS) += dma-buf-sysfs-stats.o
|
|
+dma-buf-objs-$(CONFIG_DMABUF_HEAPS) += dma-heap.o
|
|
+obj-$(CONFIG_DMABUF_HEAPS) += heaps/
|
|
+dma-buf-objs-$(CONFIG_SYNC_FILE) += sync_file.o
|
|
+dma-buf-objs-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o
|
|
+dma-buf-objs-$(CONFIG_UDMABUF) += udmabuf.o
|
|
+dma-buf-objs-$(CONFIG_DMABUF_SYSFS_STATS) += dma-buf-sysfs-stats.o
|
|
|
|
dmabuf_selftests-y := \
|
|
selftest.o \
|
|
@@ -15,4 +17,6 @@ dmabuf_selftests-y := \
|
|
st-dma-fence-unwrap.o \
|
|
st-dma-resv.o
|
|
|
|
-obj-$(CONFIG_DMABUF_SELFTESTS) += dmabuf_selftests.o
|
|
+dma-buf-objs-$(CONFIG_DMABUF_SELFTESTS) += dmabuf_selftests.o
|
|
+
|
|
+dma-shared-buffer-objs := $(dma-buf-objs-y)
|
|
--- a/drivers/dma-buf/dma-buf.c
|
|
+++ b/drivers/dma-buf/dma-buf.c
|
|
@@ -1636,4 +1636,5 @@ static void __exit dma_buf_deinit(void)
|
|
kern_unmount(dma_buf_mnt);
|
|
dma_buf_uninit_sysfs_statistics();
|
|
}
|
|
-__exitcall(dma_buf_deinit);
|
|
+module_exit(dma_buf_deinit);
|
|
+MODULE_LICENSE("GPL");
|
|
--- a/kernel/sched/core.c
|
|
+++ b/kernel/sched/core.c
|
|
@@ -4363,6 +4363,7 @@ int wake_up_state(struct task_struct *p,
|
|
{
|
|
return try_to_wake_up(p, state, 0);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(wake_up_state);
|
|
|
|
/*
|
|
* Perform scheduler related setup for a newly forked process p.
|
|
--- a/fs/d_path.c
|
|
+++ b/fs/d_path.c
|
|
@@ -313,6 +313,7 @@ char *dynamic_dname(char *buffer, int bu
|
|
buffer += buflen - sz;
|
|
return memcpy(buffer, temp, sz);
|
|
}
|
|
+EXPORT_SYMBOL_GPL(dynamic_dname);
|
|
|
|
char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
|
|
{
|