diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:27:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:27:15 +0000 |
| commit | a33528d510dcb2e83b5ff48fb020acd97e9af2db (patch) | |
| tree | 4838facd92bb3cfae92f01a6dfb780cc47c29d7e /arch/arc/mm | |
| parent | Releasing progress-linux version 6.9.12-1~progress7.99u1. (diff) | |
| download | linux-a33528d510dcb2e83b5ff48fb020acd97e9af2db.tar.xz linux-a33528d510dcb2e83b5ff48fb020acd97e9af2db.zip | |
Merging upstream version 6.10.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'arch/arc/mm')
| -rw-r--r-- | arch/arc/mm/dma.c | 3 | ||||
| -rw-r--r-- | arch/arc/mm/mmap.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c index 197707bc76..6b85e94f32 100644 --- a/arch/arc/mm/dma.c +++ b/arch/arc/mm/dma.c @@ -90,8 +90,7 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, /* * Plug in direct dma map ops. */ -void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, - bool coherent) +void arch_setup_dma_ops(struct device *dev, bool coherent) { /* * IOC hardware snoops all DMA traffic keeping the caches consistent diff --git a/arch/arc/mm/mmap.c b/arch/arc/mm/mmap.c index 3c1c7ae732..69a9152971 100644 --- a/arch/arc/mm/mmap.c +++ b/arch/arc/mm/mmap.c @@ -27,7 +27,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; - struct vm_unmapped_area_info info; + struct vm_unmapped_area_info info = {}; /* * We enforce the MAP_FIXED case. @@ -51,11 +51,9 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, return addr; } - info.flags = 0; info.length = len; info.low_limit = mm->mmap_base; info.high_limit = TASK_SIZE; - info.align_mask = 0; info.align_offset = pgoff << PAGE_SHIFT; return vm_unmapped_area(&info); } |