From: Tang Chen <tangchen@cn.fujitsu.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
lenb@kernel.org, rjw@sisk.pl, liwanp@linux.vnet.ibm.com,
tj@kernel.org, joe@perches.com, akpm@linux-foundation.org
Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Subject: [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
Date: Fri, 16 Aug 2013 18:11:11 +0800 [thread overview]
Message-ID: <1376647871-17345-1-git-send-email-tangchen@cn.fujitsu.com> (raw)
In-Reply-To: <1376637949.1947.3.camel@joe-AO722>
Use pr_info() instead of printk() in arch/x86/mm/srat.c.
As Joe suggested, define pr_fmt(fmt) as KBUILD_MODNAME ": " fmt to
prefix message with "srat: ".
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Joe Perches <joe@perches.com>
---
arch/x86/mm/srat.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index 71411aa..591f4bb 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -24,6 +24,8 @@
#include <asm/apic.h>
#include <asm/uv/uv.h>
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
int acpi_numa __initdata;
static __init int setup_node(int pxm)
@@ -71,8 +73,8 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
pxm = pa->proximity_domain;
apic_id = pa->apic_id;
if (!apic->apic_id_valid(apic_id)) {
- printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
- pxm, apic_id);
+ pr_info("PXM %u -> X2APIC 0x%04x ignored\n",
+ pxm, apic_id);
return;
}
node = setup_node(pxm);
@@ -83,13 +85,13 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
}
if (apic_id >= MAX_LOCAL_APIC) {
- printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
+ pr_info("PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
return;
}
set_apicid_to_node(apic_id, node);
node_set(node, numa_nodes_parsed);
acpi_numa = 1;
- printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
+ pr_info("PXM %u -> APIC 0x%04x -> Node %u\n",
pxm, apic_id, node);
}
@@ -124,14 +126,14 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
apic_id = pa->apic_id;
if (apic_id >= MAX_LOCAL_APIC) {
- printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
+ pr_info("PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
return;
}
set_apicid_to_node(apic_id, node);
node_set(node, numa_nodes_parsed);
acpi_numa = 1;
- printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
+ pr_info("PXM %u -> APIC 0x%02x -> Node %u\n",
pxm, apic_id, node);
}
@@ -169,8 +171,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
node_set(node, numa_nodes_parsed);
- pr_info("SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]%s\n",
- node, pxm,
+ pr_info("Node %u PXM %u [mem %#010Lx-%#010Lx]%s\n", node, pxm,
(unsigned long long) start, (unsigned long long) end - 1,
hotpluggable ? " hotplug" : "");
--
1.7.1
next prev parent reply other threads:[~2013-08-16 10:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-16 7:06 [PATCH 0/6] acpi: Fix and cleanup in acpi Tang Chen
2013-08-16 7:06 ` [PATCH 1/6] acpi, numa, mem_hotplug: Kill save_add_info() Tang Chen
2013-08-19 18:48 ` Toshi Kani
2013-08-16 7:06 ` [PATCH 2/6] acpi, numa, mem_hotplug: Print Hot-Pluggable Field in SRAT Tang Chen
2013-08-19 18:48 ` Toshi Kani
2013-08-16 7:06 ` [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c Tang Chen
2013-08-16 7:25 ` Joe Perches
2013-08-16 7:58 ` Tang Chen
2013-08-16 10:11 ` Tang Chen [this message]
2013-08-16 10:11 ` [PATCH 4/6] acpi cleanup: Use pr_err() " Tang Chen
2013-08-19 18:53 ` [PATCH 3/6] acpi cleanup: Use pr_info() " Toshi Kani
2013-08-16 7:06 ` [PATCH 4/6] acpi cleanup: Use pr_err() " Tang Chen
2013-08-16 7:06 ` [PATCH 5/6] acpi: Check if @id is NULL in acpi_table_parse() Tang Chen
2013-08-19 19:29 ` Toshi Kani
2013-08-16 7:06 ` [PATCH 6/6] acpi: Return -ENOENT in acpi_table_parse() and fix wrong comment Tang Chen
2013-08-19 19:29 ` Toshi Kani
2013-08-20 1:19 ` Tang Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376647871-17345-1-git-send-email-tangchen@cn.fujitsu.com \
--to=tangchen@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=joe@perches.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liwanp@linux.vnet.ibm.com \
--cc=mingo@redhat.com \
--cc=rjw@sisk.pl \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®