ACPI / NUMA: remove unneeded acpi_numa=1

hanjun-guo · rafaeljw · commit fb1f4181cef6 · 2016-05-30T14:27:08.000+02:00
acpi_numa is default to 0, it's set to -1 when disable acpi numa or
when a bad SRAT is parsed, and it's only consumed in srat_disabled()
(compare it with 0) to continue parse the SRAT or not, so we don't
need to set acpi_numa to 1 when we get a valid SRAT entry.

Signed-off-by: Hanjun Guo &lt;hanjun.guo@linaro.org&gt;
Signed-off-by: Robert Richter &lt;rrichter@cavium.com&gt;
Signed-off-by: David Daney &lt;david.daney@cavium.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
@@ -59,7 +59,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
 	}
 	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);
 }
@@ -101,7 +100,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
 
 	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);
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)`
`59`	`59`	`}`
`60`	`60`	`set_apicid_to_node(apic_id, node);`
`61`	`61`	`node_set(node, numa_nodes_parsed);`
`62`		`- acpi_numa = 1;`
`63`	`62`	`printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",`
`64`	`63`	`pxm, apic_id, node);`
`65`	`64`	`}`
`@@ -101,7 +100,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)`
`101`	`100`
`102`	`101`	`set_apicid_to_node(apic_id, node);`
`103`	`102`	`node_set(node, numa_nodes_parsed);`
`104`		`- acpi_numa = 1;`
`105`	`103`	`printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",`
`106`	`104`	`pxm, apic_id, node);`
`107`	`105`	`}`