Re: [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
On Fri, 2013-08-16 at 15:06 +0800, Tang Chen wrote: > Use pr_info() instead of printk() in arch/x86/mm/srat.c. > > Signed-off-by: Tang Chen Please fold patch 4/6 into this patch 3/6 since they both are printk() cleanup on the same file. I do not see why they need to be separated. With that change, Acked-by: Toshi Kani Thanks, -Toshi -- 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/
Re: [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
On Fri, 2013-08-16 at 15:06 +0800, Tang Chen wrote: Use pr_info() instead of printk() in arch/x86/mm/srat.c. Signed-off-by: Tang Chen tangc...@cn.fujitsu.com Please fold patch 4/6 into this patch 3/6 since they both are printk() cleanup on the same file. I do not see why they need to be separated. With that change, Acked-by: Toshi Kani toshi.k...@hp.com Thanks, -Toshi -- 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/
[PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
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
Signed-off-by: Joe Perches
---
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
#include
+#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/
Re: [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
Hi Joe, On 08/16/2013 03:25 PM, Joe Perches wrote: On Fri, 2013-08-16 at 15:06 +0800, Tang Chen wrote: arch/x86/mm/srat.c I think it'd be better to use pr_fmt with the conversions to pr_info and pr_err. pr_fmt can prefix the appropriate srat: and so the format strings do not need it. Something like: --- arch/x86/mm/srat.c | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index cdd0da9..350b4c5 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -9,6 +9,8 @@ * are in one chunk. Holes between them will be included in the node. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt OK, will update the patches. Thanks. :) -- 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/
Re: [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
On Fri, 2013-08-16 at 15:06 +0800, Tang Chen wrote:
> arch/x86/mm/srat.c
I think it'd be better to use pr_fmt
with the conversions to pr_info and pr_err.
pr_fmt can prefix the appropriate srat: and
so the format strings do not need it.
Something like:
---
arch/x86/mm/srat.c | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index cdd0da9..350b4c5 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -9,6 +9,8 @@
* are in one chunk. Holes between them will be included in the node.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include
#include
#include
@@ -33,7 +35,7 @@ static __init int setup_node(int pxm)
static __init void bad_srat(void)
{
- printk(KERN_ERR "SRAT: SRAT not used.\n");
+ pr_err("SRAT not used\n");
acpi_numa = -1;
}
@@ -71,26 +73,25 @@ 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);
if (node < 0) {
- printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
+ pr_err("Too many proximity domains %x\n", pxm);
bad_srat();
return;
}
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",
- pxm, apic_id, node);
+ pr_info("PXM %u -> APIC 0x%04x -> Node %u\n", pxm, apic_id, node);
}
/* Callback for Proximity Domain -> LAPIC mapping */
@@ -113,7 +114,7 @@ acpi_numa_processor_affinity_init(struct
acpi_srat_cpu_affinity *pa)
pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
node = setup_node(pxm);
if (node < 0) {
- printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
+ pr_err("Too many proximity domains %x\n", pxm);
bad_srat();
return;
}
@@ -124,15 +125,15 @@ 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",
- pxm, apic_id, node);
+ pr_info("PXM %u -> APIC 0x%02x -> Node %u\n", pxm, apic_id, node);
}
#ifdef CONFIG_MEMORY_HOTPLUG
@@ -165,7 +166,7 @@ acpi_numa_memory_affinity_init(struct
acpi_srat_mem_affinity *ma)
node = setup_node(pxm);
if (node < 0) {
- printk(KERN_ERR "SRAT: Too many proximity domains.\n");
+ pr_err("Too many proximity domains\n");
goto out_err_bad_srat;
}
@@ -174,9 +175,9 @@ acpi_numa_memory_affinity_init(struct
acpi_srat_mem_affinity *ma)
node_set(node, numa_nodes_parsed);
- printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
- node, pxm,
- (unsigned long long) start, (unsigned long long) end - 1);
+ pr_info("Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
+ node, pxm,
+ (unsigned long long) start, (unsigned long long) end - 1);
return 0;
out_err_bad_srat:
--
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/
[PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
Use pr_info() instead of printk() in arch/x86/mm/srat.c.
Signed-off-by: Tang Chen
---
arch/x86/mm/srat.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index 71411aa..6286e89 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -71,8 +71,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("SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
+ pxm, apic_id);
return;
}
node = setup_node(pxm);
@@ -83,13 +83,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("SRAT: 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("SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
pxm, apic_id, node);
}
@@ -124,14 +124,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("SRAT: 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("SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
pxm, apic_id, node);
}
--
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/
[PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
Use pr_info() instead of printk() in arch/x86/mm/srat.c.
Signed-off-by: Tang Chen tangc...@cn.fujitsu.com
---
arch/x86/mm/srat.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index 71411aa..6286e89 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -71,8 +71,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(SRAT: PXM %u - X2APIC 0x%04x ignored\n,
+ pxm, apic_id);
return;
}
node = setup_node(pxm);
@@ -83,13 +83,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(SRAT: 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(SRAT: PXM %u - APIC 0x%04x - Node %u\n,
pxm, apic_id, node);
}
@@ -124,14 +124,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(SRAT: 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(SRAT: PXM %u - APIC 0x%02x - Node %u\n,
pxm, apic_id, node);
}
--
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/
Re: [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
On Fri, 2013-08-16 at 15:06 +0800, Tang Chen wrote:
arch/x86/mm/srat.c
I think it'd be better to use pr_fmt
with the conversions to pr_info and pr_err.
pr_fmt can prefix the appropriate srat: and
so the format strings do not need it.
Something like:
---
arch/x86/mm/srat.c | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index cdd0da9..350b4c5 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -9,6 +9,8 @@
* are in one chunk. Holes between them will be included in the node.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME : fmt
+
#include linux/kernel.h
#include linux/acpi.h
#include linux/mmzone.h
@@ -33,7 +35,7 @@ static __init int setup_node(int pxm)
static __init void bad_srat(void)
{
- printk(KERN_ERR SRAT: SRAT not used.\n);
+ pr_err(SRAT not used\n);
acpi_numa = -1;
}
@@ -71,26 +73,25 @@ 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);
if (node 0) {
- printk(KERN_ERR SRAT: Too many proximity domains %x\n, pxm);
+ pr_err(Too many proximity domains %x\n, pxm);
bad_srat();
return;
}
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,
- pxm, apic_id, node);
+ pr_info(PXM %u - APIC 0x%04x - Node %u\n, pxm, apic_id, node);
}
/* Callback for Proximity Domain - LAPIC mapping */
@@ -113,7 +114,7 @@ acpi_numa_processor_affinity_init(struct
acpi_srat_cpu_affinity *pa)
pxm |= *((unsigned int*)pa-proximity_domain_hi) 8;
node = setup_node(pxm);
if (node 0) {
- printk(KERN_ERR SRAT: Too many proximity domains %x\n, pxm);
+ pr_err(Too many proximity domains %x\n, pxm);
bad_srat();
return;
}
@@ -124,15 +125,15 @@ 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,
- pxm, apic_id, node);
+ pr_info(PXM %u - APIC 0x%02x - Node %u\n, pxm, apic_id, node);
}
#ifdef CONFIG_MEMORY_HOTPLUG
@@ -165,7 +166,7 @@ acpi_numa_memory_affinity_init(struct
acpi_srat_mem_affinity *ma)
node = setup_node(pxm);
if (node 0) {
- printk(KERN_ERR SRAT: Too many proximity domains.\n);
+ pr_err(Too many proximity domains\n);
goto out_err_bad_srat;
}
@@ -174,9 +175,9 @@ acpi_numa_memory_affinity_init(struct
acpi_srat_mem_affinity *ma)
node_set(node, numa_nodes_parsed);
- printk(KERN_INFO SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n,
- node, pxm,
- (unsigned long long) start, (unsigned long long) end - 1);
+ pr_info(Node %u PXM %u [mem %#010Lx-%#010Lx]\n,
+ node, pxm,
+ (unsigned long long) start, (unsigned long long) end - 1);
return 0;
out_err_bad_srat:
--
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/
Re: [PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
Hi Joe, On 08/16/2013 03:25 PM, Joe Perches wrote: On Fri, 2013-08-16 at 15:06 +0800, Tang Chen wrote: arch/x86/mm/srat.c I think it'd be better to use pr_fmt with the conversions to pr_info and pr_err. pr_fmt can prefix the appropriate srat: and so the format strings do not need it. Something like: --- arch/x86/mm/srat.c | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index cdd0da9..350b4c5 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -9,6 +9,8 @@ * are in one chunk. Holes between them will be included in the node. */ +#define pr_fmt(fmt) KBUILD_MODNAME : fmt OK, will update the patches. Thanks. :) -- 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/
[PATCH 3/6] acpi cleanup: Use pr_info() instead of printk() in arch/x86/mm/srat.c
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/
