From: Xie XiuQi <xiexiuqi(a)huawei.com>
commit 3d3429a897c21d57e57240aad5a89fe8c0d28d25 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/kernel/mpam.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c
index 519fcf72836d..1db7e74a73ff 100644
--- a/arch/arm64/kernel/mpam.c
+++ b/arch/arm64/kernel/mpam.c
@@ -147,8 +147,8 @@ void mpam_nodes_show(void)
for (i = 0; i < num_nodes; i++) {
n = &mpam_node_all[i];
- pr_cont("type: %s; addr = %p; cpus_list = %s; cpus: ",
- types[n->type], (void *)n->addr, n->cpus_list);
+ pr_cont("%s: type: %s; addr = %016llx; base = %016llx; cpus_list = %s; cpus:
",
+ __func__, types[n->type], n->addr, (u64)n->base, n->cpus_list);
for_each_cpu(cpu, &n->cpu_mask) {
pr_cont("%d, ", cpu);
@@ -821,8 +821,8 @@ static void mpam_domains_init(struct resctrl_resource *r)
if (r->rid != n->type)
continue;
- pr_cont("type: %s; addr = %p; cpus_list = %s; cpus: ",
- types[n->type], (void *)n->addr, n->cpus_list);
+ pr_cont("%s: type: %s; addr = %016llx; base = %016llx; cpus_list = %s; cpus:
",
+ __func__, types[n->type], n->addr, (u64)n->base, n->cpus_list);
for_each_cpu(cpu, &n->cpu_mask) {
pr_cont("%d, ", cpu);
@@ -864,8 +864,8 @@ static void mpam_domains_init(struct resctrl_resource *r)
list_for_each(l, &r->domains) {
d = list_entry(l, struct rdt_domain, list);
- pr_cont("domain: %d; type: %s; addr = %p; cpus_list = %s; cpus: ",
- d->id, types[r->rid], (void *)d->base, d->cpus_list);
+ pr_cont("domain: %d; type: %s; base = %016llx; cpus_list = %s; cpus: ",
+ d->id, types[r->rid], (u64)d->base, d->cpus_list);
for_each_cpu(cpu, &d->cpu_mask) {
pr_cont("%d, ", cpu);
--
2.31.0