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 <tangc...@cn.fujitsu.com>
Signed-off-by: Joe Perches <j...@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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
