generic: 5.15: refresh hack patch

[openwrt/staging/stintel.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 b2fdc0991e82af4b96fb91af5a95e055e232d2dd..fc7cd20963079d6c92114411db1974b1cde62d65 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
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/base/Kconfig
 +++ b/drivers/base/Kconfig
-@@ -184,7 +184,7 @@ config SOC_BUS
+@@ -187,7 +187,7 @@ config SOC_BUS
  source "drivers/base/regmap/Kconfig"
  
  config DMA_SHARED_BUFFER
@@ -63,16 +63,16 @@ 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
-@@ -1419,4 +1419,5 @@ static void __exit dma_buf_deinit(void)
-       dma_buf_uninit_debugfs();
+@@ -1498,4 +1498,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
-@@ -3065,6 +3065,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4174,6 +4174,7 @@ int wake_up_state(struct task_struct *p,
  {
        return try_to_wake_up(p, state, 0);
  }
@@ -82,7 +82,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
   * Perform scheduler related setup for a newly forked process p.
 --- a/fs/d_path.c
 +++ b/fs/d_path.c
-@@ -311,6 +311,7 @@ char *dynamic_dname(struct dentry *dentr
+@@ -316,6 +316,7 @@ char *dynamic_dname(struct dentry *dentr
        buffer += buflen - sz;
        return memcpy(buffer, temp, sz);
  }