diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-01-20 10:16:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-01-20 10:16:18 -0800 |
| commit | c03e9c42ae8f9be76a0cf55ef3f88663f0f6a63a (patch) | |
| tree | 2cd0a78dfac34afb1d534f18d5d23df7665b033c /include | |
| parent | 8f7537efbe5636a798cf885ea2fa0e4889995fa9 (diff) | |
| parent | c6ccd098807483762ccd726e1498bac5a71d0005 (diff) | |
Merge tag 'dma-mapping-6.19-2026-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux
Pull dma-mapping fixes from Marek Szyprowski:
- minor fixes for the corner cases of the SWIOTLB pool management
(Robin Murphy)
* tag 'dma-mapping-6.19-2026-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
dma/pool: Avoid allocating redundant pools
mm_zone: Generalise has_managed_dma()
dma/pool: Improve pool lookup
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmzone.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 75ef7c9f9307..fc5d6c88d2f0 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1648,14 +1648,15 @@ static inline int is_highmem(const struct zone *zone) return is_highmem_idx(zone_idx(zone)); } -#ifdef CONFIG_ZONE_DMA -bool has_managed_dma(void); -#else +bool has_managed_zone(enum zone_type zone); static inline bool has_managed_dma(void) { +#ifdef CONFIG_ZONE_DMA + return has_managed_zone(ZONE_DMA); +#else return false; -} #endif +} #ifndef CONFIG_NUMA |