diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-03 10:45:03 -0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-03 10:45:03 -0800 |
| commit | 17f2d86f5d53d61b12085812a650ae12a76eaa69 (patch) | |
| tree | 13b86f9b6e2768db8a631b45b71e528200bad638 /drivers/acpi/numa.c | |
| parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) | |
| parent | beffbe54fa2df3a80d74f168c38e0248adbde082 (diff) | |
Merge branch 'pci/numa-cleanup' into next
* pci/numa-cleanup:
ACPI / numa: Use __weak, not the gcc-specific version
ACPI / numa: Make __acpi_map_pxm_to_node(), acpi_get_pxm() static
ACPI / numa: Simplify acpi_get_node() style
ACPI / numa: Fix acpi_get_node() prototype
ia64: Remove acpi_get_pxm() usage
ia64 / sba_iommu: Use NUMA_NO_NODE, not MAX_NUMNODES, for unknown node
x86/PCI: Remove acpi_get_pxm() usage
x86/PCI: Use NUMA_NO_NODE, not -1, for unknown node
x86/PCI: Remove unnecessary list_empty(&pci_root_infos) check
x86/PCI: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node()
x86/PCI: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node()
x86/PCI: Add x86_pci_root_bus_node() to look up NUMA node from PCI bus
x86/PCI: Drop return value of pcibios_scan_root()
x86/PCI: Merge pci_scan_bus_on_node() into pcibios_scan_root()
x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_on_node()
x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_with_sysdata()
x86/PCI: Drop pcibios_scan_root() check for bus already scanned
Diffstat (limited to 'drivers/acpi/numa.c')
| -rw-r--r-- | drivers/acpi/numa.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 9e6816ef280..24b5476449a 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -60,7 +60,7 @@ int node_to_pxm(int node) return node_to_pxm_map[node]; } -void __acpi_map_pxm_to_node(int pxm, int node) +static void __acpi_map_pxm_to_node(int pxm, int node) { if (pxm_to_node_map[pxm] == NUMA_NO_NODE || node < pxm_to_node_map[pxm]) pxm_to_node_map[pxm] = node; @@ -193,7 +193,7 @@ static int __init acpi_parse_slit(struct acpi_table_header *table) return 0; } -void __init __attribute__ ((weak)) +void __init __weak acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) { printk(KERN_WARNING PREFIX @@ -314,7 +314,7 @@ int __init acpi_numa_init(void) return 0; } -int acpi_get_pxm(acpi_handle h) +static int acpi_get_pxm(acpi_handle h) { unsigned long long pxm; acpi_status status; @@ -331,14 +331,14 @@ int acpi_get_pxm(acpi_handle h) return -1; } -int acpi_get_node(acpi_handle *handle) +int acpi_get_node(acpi_handle handle) { - int pxm, node = NUMA_NO_NODE; + int pxm; pxm = acpi_get_pxm(handle); - if (pxm >= 0 && pxm < MAX_PXM_DOMAINS) - node = acpi_map_pxm_to_node(pxm); + if (pxm < 0 || pxm >= MAX_PXM_DOMAINS) + return NUMA_NO_NODE; - return node; + return acpi_map_pxm_to_node(pxm); } EXPORT_SYMBOL(acpi_get_node); |