Commit 2deb55d9 authored by Wei Liu's avatar Wei Liu
Browse files

swiotlb: Add CONFIG_HAS_IOMEM check around swiotlb_mem_remap() 



HAS_IOMEM option may not be selected on some platforms (e.g, s390) and
this will cause compilation failure due to missing memremap()
implementation.

Fix it by stubbing out swiotlb_mem_remap when CONFIG_HAS_IOMEM is not
set.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarTianyu Lan <Tianyu.Lan@microsoft.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent e1878402

kernel/dma/swiotlb.c

+7 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static inline unsigned long nr_slots(u64 val) 
 * when swiotlb_unencrypted_base is set. (e.g. for Hyper-V AMD SEV-SNP

 * Isolation VMs).

 */

#ifdef CONFIG_HAS_IOMEM

static void *swiotlb_mem_remap(struct io_tlb_mem *mem, unsigned long bytes)

{

	void *vaddr = NULL;
@@ -178,6 +179,12 @@ static void *swiotlb_mem_remap(struct io_tlb_mem *mem, unsigned long bytes) 


	return vaddr;

}

#else

static void *swiotlb_mem_remap(struct io_tlb_mem *mem, unsigned long bytes)

{

	return NULL;

}

#endif



/*

 * Early SWIOTLB allocation may be too early to allow an architecture to