|
@@ -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:
|