Skip to content

Commit ff06cd4

Browse files
rddunlapgregkh
authored andcommitted
swiotlb: mark swiotlb_memblock_alloc() as __init
commit 9b07d27 upstream. swiotlb_memblock_alloc() calls memblock_alloc(), which calls (__init) memblock_alloc_try_nid(). However, swiotlb_membloc_alloc() can be marked as __init since it is only called by swiotlb_init_remap(), which is already marked as __init. This prevents a modpost build warning/error: WARNING: modpost: vmlinux.o: section mismatch in reference: swiotlb_memblock_alloc (section: .text) -> memblock_alloc_try_nid (section: .init.text) WARNING: modpost: vmlinux.o: section mismatch in reference: swiotlb_memblock_alloc (section: .text) -> memblock_alloc_try_nid (section: .init.text) This fixes the build warning/error seen on ARM64, PPC64, S390, i386, and x86_64. Fixes: 8d58aa4 ("swiotlb: reduce the swiotlb buffer size on allocation failure") Signed-off-by: Randy Dunlap <[email protected]> Cc: Alexey Kardashevskiy <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: [email protected] Cc: Mike Rapoport <[email protected]> Cc: [email protected] Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d64b70d commit ff06cd4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

kernel/dma/swiotlb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,8 @@ static void swiotlb_init_io_tlb_mem(struct io_tlb_mem *mem, phys_addr_t start,
324324
return;
325325
}
326326

327-
static void *swiotlb_memblock_alloc(unsigned long nslabs, unsigned int flags,
327+
static void __init *swiotlb_memblock_alloc(unsigned long nslabs,
328+
unsigned int flags,
328329
int (*remap)(void *tlb, unsigned long nslabs))
329330
{
330331
size_t bytes = PAGE_ALIGN(nslabs << IO_TLB_SHIFT);

0 commit comments

Comments
 (0)