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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 1151a1dcfe41..6c29abbefd41 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -259,14 +259,9 @@ extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d); extern void acpi_osi_setup(char *str); #ifdef CONFIG_ACPI_NUMA -int acpi_get_pxm(acpi_handle handle); -int acpi_get_node(acpi_handle *handle); +int acpi_get_node(acpi_handle handle); #else -static inline int acpi_get_pxm(acpi_handle handle) -{ - return 0; -} -static inline int acpi_get_node(acpi_handle *handle) +static inline int acpi_get_node(acpi_handle handle) { return 0; } |