diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 22:24:55 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 22:24:55 +0200 |
commit | 10b22b533ee2c9621f8ab74cf9df1021b5731dbc (patch) | |
tree | 16f382d3fd5b7f727f9827dc6ff63fd0caab92e0 /lib/sg_pool.c | |
parent | Merge tag 'iommu-updates-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | ARM/dma-mapping: remove the dma_coherent member of struct dev_archdata (diff) | |
download | linux-10b22b533ee2c9621f8ab74cf9df1021b5731dbc.tar.xz linux-10b22b533ee2c9621f8ab74cf9df1021b5731dbc.zip |
Merge tag 'dma-mapping-6.1-2022-10-10' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- fix a regression in the ARM dma-direct conversion (Christoph Hellwig)
- use memcpy_{from,to}_page (Fabio M. De Francesco)
- cleanup the swiotlb MAINTAINERS entry (Lukas Bulwahn)
- make SG table pool allocation less fragile (Masahiro Yamada)
- don't panic on swiotlb initialization failure (Robin Murphy)
* tag 'dma-mapping-6.1-2022-10-10' of git://git.infradead.org/users/hch/dma-mapping:
ARM/dma-mapping: remove the dma_coherent member of struct dev_archdata
ARM/dma-mappіng: don't override ->dma_coherent when set from a bus notifier
lib/sg_pool: change module_init(sg_pool_init) to subsys_initcall
MAINTAINERS: merge SWIOTLB SUBSYSTEM into DMA MAPPING HELPERS
swiotlb: don't panic!
swiotlb: replace kmap_atomic() with memcpy_{from,to}_page()
Diffstat (limited to 'lib/sg_pool.c')
-rw-r--r-- | lib/sg_pool.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/sg_pool.c b/lib/sg_pool.c index a0b1a52cd6f7..9bfe60ca3f37 100644 --- a/lib/sg_pool.c +++ b/lib/sg_pool.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -#include <linux/module.h> +#include <linux/init.h> #include <linux/scatterlist.h> #include <linux/mempool.h> #include <linux/slab.h> @@ -177,16 +177,4 @@ cleanup_sdb: return -ENOMEM; } -static __exit void sg_pool_exit(void) -{ - int i; - - for (i = 0; i < SG_MEMPOOL_NR; i++) { - struct sg_pool *sgp = sg_pools + i; - mempool_destroy(sgp->pool); - kmem_cache_destroy(sgp->slab); - } -} - -module_init(sg_pool_init); -module_exit(sg_pool_exit); +subsys_initcall(sg_pool_init); |