From b704243f8e1a7834b74be6c13a5b4f70629d75d8 Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Tue, 29 Jan 2019 17:38:18 +0800 Subject: [PATCH 2813/2944] openEuler: arm64/mpam: debug: fix debug format commit 3d3429a897c21d57e57240aad5a89fe8c0d28d25 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi Reviewed-by: Hanjun Guo Signed-off-by: Yang Yingliang Signed-off-by: Xin Hao Reviewed-by: Baolin Wang --- 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 519fcf7..1db7e74 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); -- 1.8.3.1