ath25: switch default kernel to 5.15

[openwrt/staging/ldir.git] / target / linux / generic / hack-5.10 / 904-debloat_dma_buf.patch

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 2f5f685063a0241af629560e3750835975d79a61..7bf15c1dd8f6aa0e4bb6a935e2de598120804fa2 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
  
@@ -53,7 +63,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +dma-shared-buffer-objs :=  $(dma-buf-objs-y)
 --- a/drivers/dma-buf/dma-buf.c
 +++ b/drivers/dma-buf/dma-buf.c
-@@ -1418,4 +1418,5 @@ static void __exit dma_buf_deinit(void)
+@@ -1419,4 +1419,5 @@ static void __exit dma_buf_deinit(void)
        dma_buf_uninit_debugfs();
        kern_unmount(dma_buf_mnt);
  }
@@ -62,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p,
+@@ -3074,6 +3074,7 @@ int wake_up_state(struct task_struct *p,
  {
        return try_to_wake_up(p, state, 0);
  }