aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2021-11-04 23:25:50 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-03-27 00:07:34 +0000
commit1f302afd7350f46ec0fcc4b12b0ad59ac92fe5b6 (patch)
tree7c015f93344ad49d6dbf9888364b65f442d18483 /target/linux/generic/hack-5.15/904-debloat_dma_buf.patch
parent7829ae4a2f9d37fa66b683d5824e0e3e93bb6c50 (diff)
downloadupstream-1f302afd7350f46ec0fcc4b12b0ad59ac92fe5b6.tar.gz
upstream-1f302afd7350f46ec0fcc4b12b0ad59ac92fe5b6.tar.bz2
upstream-1f302afd7350f46ec0fcc4b12b0ad59ac92fe5b6.zip
generic: 5.15: rework hack patch
Rework hack patch in dir for kernel 5.15. For the specific patch of packet mangeling introduce a new extra_priv_flags as we don't have enough space to add additional flags in priv_flags. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-5.15/904-debloat_dma_buf.patch')
-rw-r--r--target/linux/generic/hack-5.15/904-debloat_dma_buf.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch
index 54e78cedc8..b2fdc0991e 100644
--- a/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch
+++ b/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch
@@ -24,17 +24,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
--- a/drivers/dma-buf/heaps/Makefile
+++ b/drivers/dma-buf/heaps/Makefile
-@@ -1,4 +1,4 @@
+@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
--obj-y += heap-helpers.o
-obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
-obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o
-+dma-buf-objs-y += heap-helpers.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,15 +1,19 @@
+@@ -1,16 +1,20 @@
# 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
@@ -46,11 +44,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
-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) += udmabuf.o
dmabuf_selftests-y := \
selftest.o \