diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-18 06:22:08 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-18 06:22:08 +1200 |
| commit | 6d060fa39035d5ff6bb3e720a8119aeb50453e3b (patch) | |
| tree | d7c45afe9a8e97d202e38f265a9aecac3b11658c | |
| parent | e4484a495586dddf989380f89a7c16d43db6790b (diff) | |
| parent | 227a76b64718888c1687cc237463aa000ae6fb2b (diff) | |
| download | linux-6d060fa39035d5ff6bb3e720a8119aeb50453e3b.tar.bz2 | |
Merge branch 'stable/for-linus-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb fix from Konrad Rzeszutek Wilk:
"A tiny fix for v5.0-rc2:
This fixes an issue with GPU cards not working anymore with the DMA
mapping work Christopher did - as the SWIOTLB is initialized first and
then free'd (as IOMMU is available) but we forgot to clear our start
and end entries which are used and BOOM"
* 'stable/for-linus-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb: clear io_tlb_start and io_tlb_end in swiotlb_exit
| -rw-r--r-- | kernel/dma/swiotlb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index d6361776dc5c..1fb6fd68b9c7 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -378,6 +378,8 @@ void __init swiotlb_exit(void) memblock_free_late(io_tlb_start, PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT)); } + io_tlb_start = 0; + io_tlb_end = 0; io_tlb_nslabs = 0; max_segment = 0; } |