From 1c055e55a242a33e574e48be530e06770a210dcd Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Mon, 19 Feb 2024 03:26:26 +0000 Subject: [PATCH] add r8169 read mac form eeprom --- kernel/drivers/dma-buf/heaps/rk_cma_heap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/drivers/dma-buf/heaps/rk_cma_heap.c b/kernel/drivers/dma-buf/heaps/rk_cma_heap.c index 12557dc..c93674c 100644 --- a/kernel/drivers/dma-buf/heaps/rk_cma_heap.c +++ b/kernel/drivers/dma-buf/heaps/rk_cma_heap.c @@ -15,7 +15,7 @@ #include <linux/cma.h> #include <linux/dma-buf.h> #include <linux/dma-heap.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/err.h> #include <linux/highmem.h> #include <linux/io.h> @@ -135,7 +135,7 @@ dma_unmap_sgtable(attachment->dev, table, direction, attrs); } -static int +static int __maybe_unused cma_heap_dma_buf_begin_cpu_access_partial(struct dma_buf *dmabuf, enum dma_data_direction direction, unsigned int offset, @@ -160,7 +160,7 @@ return 0; } -static int +static int __maybe_unused cma_heap_dma_buf_end_cpu_access_partial(struct dma_buf *dmabuf, enum dma_data_direction direction, unsigned int offset, @@ -334,8 +334,10 @@ .unmap_dma_buf = cma_heap_unmap_dma_buf, .begin_cpu_access = cma_heap_dma_buf_begin_cpu_access, .end_cpu_access = cma_heap_dma_buf_end_cpu_access, +#ifdef CONFIG_DMABUF_PARTIAL .begin_cpu_access_partial = cma_heap_dma_buf_begin_cpu_access_partial, .end_cpu_access_partial = cma_heap_dma_buf_end_cpu_access_partial, +#endif .mmap = cma_heap_mmap, .vmap = cma_heap_vmap, .vunmap = cma_heap_vunmap, @@ -388,7 +390,7 @@ kunmap_atomic(vaddr); /* * Avoid wasting time zeroing memory if the process - * has been killed by SIGKILL + * has been killed by by SIGKILL */ if (fatal_signal_pending(current)) goto free_cma; @@ -518,8 +520,6 @@ if (!heap_dev) return -EINVAL; - - arch_setup_dma_ops(heap_dev, 0, 0, NULL, 0); dma_coerce_mask_and_coherent(heap_dev, DMA_BIT_MASK(64)); -- Gitblit v1.6.2