From: Xie XiuQi <xiexiuqi(a)huawei.com>
commit eb910d169496d481dd594c848195d4c5318cfb62 openEuler-1.0
hulk inclusion
category: feature
bugzilla: 5510
CVE: NA
Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com>
Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com>
Signed-off-by: Xin Hao <haoxing990(a)gmail.com>
---
arch/arm64/include/asm/mpam.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h
index b7764f5b7c07..315d1256d8d3 100644
--- a/arch/arm64/include/asm/mpam.h
+++ b/arch/arm64/include/asm/mpam.h
@@ -266,7 +266,7 @@ static inline u64 mpam_write_sysreg_s(u64 v, u64 reg, char *name)
#ifdef MPAM_SYS_REG_DEBUG
static inline u32 mpam_readl(const volatile void __iomem *addr)
{
- return pr_info("readl: %p\n", addr);
+ return pr_info("readl: %016llx\n", (u64)addr);
}
#else
#define mpam_readl(addr) readl(addr)
@@ -275,7 +275,7 @@ static inline u32 mpam_readl(const volatile void __iomem *addr)
#ifdef MPAM_SYS_REG_DEBUG
static inline u32 mpam_writel(u64 v, const volatile void __iomem *addr)
{
- return pr_info("writel: %016llx to %p\n", v, addr);
+ return pr_info("writel: %016llx to %016llx\n", v, (u64)addr);
}
#else
#define mpam_writel(v, addr) writel(v, addr)
--
2.31.0