From 1cfb63363452c4dc1e8efcbc94c29fc18e261f41 Mon Sep 17 00:00:00 2001 From: Hongchen Zhang Date: Fri, 10 Mar 2023 09:09:55 +0800 Subject: [PATCH] LoongArch: fix compile error when using make allmodconfig LoongArch inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I6LL93 ---------------------------------------- 1. when compiling at arm32 using make allmodconfig,error occurred caused by no including the required header file, so force to include the required file. 2. fix drivers/vfio/pci/vfio_pci_rdwr.c compile error on LoongArch Signed-off-by: Zheng Zengkai Signed-off-by: Hongchen Zhang (cherry picked from commit 028c67cca3dd40a78c0f025f2b8562343dcb2741) --- arch/loongarch/include/asm/io.h | 2 +- drivers/gpu/drm/loongson/lsdc_i2c.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/include/asm/io.h b/arch/loongarch/include/asm/io.h index 87a88eb792c1..5207da7c2a82 100644 --- a/arch/loongarch/include/asm/io.h +++ b/arch/loongarch/include/asm/io.h @@ -41,7 +41,7 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size, #define ioremap(offset, size) \ ioremap_prot((offset), (size), pgprot_val(PAGE_KERNEL_SUC)) -#define iounmap(addr) do { } while (0) +#define iounmap(addr) ((void)(addr)) #endif diff --git a/drivers/gpu/drm/loongson/lsdc_i2c.c b/drivers/gpu/drm/loongson/lsdc_i2c.c index 925bb8b866ad..ea64bd097a59 100644 --- a/drivers/gpu/drm/loongson/lsdc_i2c.c +++ b/drivers/gpu/drm/loongson/lsdc_i2c.c @@ -9,6 +9,7 @@ */ #include +#include #include #include -- GitLab