aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2016-05-24 18:35:40 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-30 08:27:08 -0400
commitfb1f4181cef6ca15840164a5bd41f3dc4cb4f88d (patch)
treeaff8f3004099ea0253a0233ac52e55459ff465bc /arch/x86/mm
parente84025e274e66986277e11f0dda03373e246ffad (diff)
ACPI / NUMA: remove unneeded acpi_numa=1
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 <hanjun.guo@linaro.org> Signed-off-by: Robert Richter <rrichter@cavium.com> Signed-off-by: David Daney <david.daney@cavium.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/srat.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index 4217071fb4d2..30460f57b7f3 100644
--- 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)
59 } 59 }
60 set_apicid_to_node(apic_id, node); 60 set_apicid_to_node(apic_id, node);
61 node_set(node, numa_nodes_parsed); 61 node_set(node, numa_nodes_parsed);
62 acpi_numa = 1;
63 printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n", 62 printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
64 pxm, apic_id, node); 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 set_apicid_to_node(apic_id, node); 101 set_apicid_to_node(apic_id, node);
103 node_set(node, numa_nodes_parsed); 102 node_set(node, numa_nodes_parsed);
104 acpi_numa = 1;
105 printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n", 103 printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
106 pxm, apic_id, node); 104 pxm, apic_id, node);
107} 105}