[PATCH 1/3] acpi: Print Hot-Pluggable Field in SRAT.

2013-08-14 Thread Tang Chen
The Hot-Pluggable field in SRAT suggests if the memory could be
hotplugged while the system is running. Print it as well when
parsing SRAT will help users to know which memory is hotpluggable.

Signed-off-by: Tang Chen 
Reviewed-by: Wanpeng Li 
Reviewed-by: Zhang Yanfei 
Acked-by: Tejun Heo 
---
 arch/x86/mm/srat.c |   11 +++
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index cdd0da9..266ca91 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -146,6 +146,7 @@ int __init
 acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 {
u64 start, end;
+   u32 hotpluggable;
int node, pxm;
 
if (srat_disabled())
@@ -154,7 +155,8 @@ acpi_numa_memory_affinity_init(struct 
acpi_srat_mem_affinity *ma)
goto out_err_bad_srat;
if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
goto out_err;
-   if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
+   hotpluggable = ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE;
+   if (hotpluggable && !save_add_info())
goto out_err;
 
start = ma->base_address;
@@ -174,9 +176,10 @@ 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("SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]%s\n",
+   node, pxm,
+   (unsigned long long) start, (unsigned long long) end - 1,
+   hotpluggable ? " hotplug" : "");
 
return 0;
 out_err_bad_srat:
-- 
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 1/3] acpi: Print Hot-Pluggable Field in SRAT.

2013-08-14 Thread Tang Chen
The Hot-Pluggable field in SRAT suggests if the memory could be
hotplugged while the system is running. Print it as well when
parsing SRAT will help users to know which memory is hotpluggable.

Signed-off-by: Tang Chen tangc...@cn.fujitsu.com
Reviewed-by: Wanpeng Li liw...@linux.vnet.ibm.com
Reviewed-by: Zhang Yanfei zhangyan...@cn.fujitsu.com
Acked-by: Tejun Heo t...@kernel.org
---
 arch/x86/mm/srat.c |   11 +++
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index cdd0da9..266ca91 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -146,6 +146,7 @@ int __init
 acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 {
u64 start, end;
+   u32 hotpluggable;
int node, pxm;
 
if (srat_disabled())
@@ -154,7 +155,8 @@ acpi_numa_memory_affinity_init(struct 
acpi_srat_mem_affinity *ma)
goto out_err_bad_srat;
if ((ma-flags  ACPI_SRAT_MEM_ENABLED) == 0)
goto out_err;
-   if ((ma-flags  ACPI_SRAT_MEM_HOT_PLUGGABLE)  !save_add_info())
+   hotpluggable = ma-flags  ACPI_SRAT_MEM_HOT_PLUGGABLE;
+   if (hotpluggable  !save_add_info())
goto out_err;
 
start = ma-base_address;
@@ -174,9 +176,10 @@ 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(SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]%s\n,
+   node, pxm,
+   (unsigned long long) start, (unsigned long long) end - 1,
+   hotpluggable ?  hotplug : );
 
return 0;
 out_err_bad_srat:
-- 
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/