diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-12 00:46:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-12 00:46:50 +0300 |
| commit | 893e2f9eac9ec8d65a5ae2d99656d5e9f7bd76e2 (patch) | |
| tree | 14e0590d2e0d7b5993251615fefc706175cdfeaf /drivers/acpi | |
| parent | 457e4f99765cc41d0b90e1385f51b848d6a921d0 (diff) | |
| parent | b07bc2347672cc8c7293c64499f1488278c5ca3d (diff) | |
| download | linux-893e2f9eac9ec8d65a5ae2d99656d5e9f7bd76e2.tar.xz | |
Merge tag 'dma-mapping-6.8-2024-01-08' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- reduce area lock contention for non-primary IO TLB pools (Petr
Tesarik)
- don't store redundant offsets in the dma_ranges stuctures (Robin
Murphy)
- clear dev->dma_mem when freeing per-device pools (Joakim Zhang)
* tag 'dma-mapping-6.8-2024-01-08' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: clear dev->dma_mem to NULL after freeing it
swiotlb: reduce area lock contention for non-primary IO TLB pools
dma-mapping: don't store redundant offsets
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 18af5064d268..0ba008773b00 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1532,7 +1532,6 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map) r->cpu_start = rentry->res->start; r->dma_start = rentry->res->start - rentry->offset; r->size = resource_size(rentry->res); - r->offset = rentry->offset; r++; } } |