diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-09-18 09:11:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-09-18 09:11:12 +0200 |
| commit | acff093287fb7f1d179162e531bae4ccd0ec8d65 (patch) | |
| tree | ca751cb3388522719e3e538918fad62b1c904c55 /kernel/dma | |
| parent | ALSA: hda: intel-dsp-config: Prevent SEGFAULT if ACPI_HANDLE() is NULL (diff) | |
| parent | ASoC: rt5682s: Adjust SAR ADC button mode to fix noise issue (diff) | |
| download | linux-acff093287fb7f1d179162e531bae4ccd0ec8d65.tar.gz linux-acff093287fb7f1d179162e531bae4ccd0ec8d65.zip | |
Merge tag 'asoc-fix-v6.17-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.17
A pile of fixes that accumilated over the past few -rcs, this is all
driver specifics including a small pile of quirks for new systems.
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/contiguous.c | 2 | ||||
| -rw-r--r-- | kernel/dma/pool.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 67af8a55185d..d9b9dcba6ff7 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -483,8 +483,6 @@ static int __init rmem_cma_setup(struct reserved_mem *rmem) pr_err("Reserved memory: unable to setup CMA region\n"); return err; } - /* Architecture specific contiguous memory fixup. */ - dma_contiguous_early_fixup(rmem->base, rmem->size); if (default_cma) dma_contiguous_default_area = cma; diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c index 7b04f7575796..ee45dee33d49 100644 --- a/kernel/dma/pool.c +++ b/kernel/dma/pool.c @@ -102,8 +102,8 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size, #ifdef CONFIG_DMA_DIRECT_REMAP addr = dma_common_contiguous_remap(page, pool_size, - pgprot_dmacoherent(PAGE_KERNEL), - __builtin_return_address(0)); + pgprot_decrypted(pgprot_dmacoherent(PAGE_KERNEL)), + __builtin_return_address(0)); if (!addr) goto free_page; #else |