generic: fix debloat dma-buf 5.10 patch

The current patch produces the following error when CONFIG_DMABUF_HEAPS is
enabled:
drivers/built-in.a: member drivers/dma-buf/heaps in archive is not an object

Fixes: b10d6044599d ("kernel: add linux 5.10 support")
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
index 4ed40bb63d81e7ff121b912dedd2f30ec6198352..a447e6b81334ee6e62419e88271f509b9afa0a3b 100644 (file)
--- a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
+++ b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
@@ -22,6 +22,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        default n
        select IRQ_WORK
        help
+--- a/drivers/dma-buf/heaps/Makefile
++++ b/drivers/dma-buf/heaps/Makefile
+@@ -1,4 +1,4 @@
+ # 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 @@
@@ -37,8 +47,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -obj-$(CONFIG_SW_SYNC)         += sw_sync.o sync_debug.o
 -obj-$(CONFIG_UDMABUF)         += udmabuf.o
 +dma-buf-objs-$(CONFIG_DMABUF_HEAPS)   += dma-heap.o
-+dma-buf-objs-$(CONFIG_DMABUF_HEAPS)   += heaps/
-+dma-buf-objs-$(CONFIG_SYNC_FILE)              += sync_file.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