generic: 5.15: rework hack patch

[openwrt/openwrt.git] / target / linux / generic / hack-5.15 / 904-debloat_dma_buf.patch

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 54e78cedc8f5b09110e9d1acb0e4df2d98645bbb..b2fdc0991e82af4b96fb91af5a95e055e232d2dd 100644 (file)
--- 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 \