summaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-24 15:28:42 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-02-03 10:39:22 -0700
commitb1e9cee7f68620fa2a020e35b5fbe3c4cc780e84 (patch)
treecdedb0185b3602f2a8b8a96e00c4ff43619cbec6 /arch/ia64/hp
parent10ee3d7032562d6094d3ee7de84af93fcc0250c7 (diff)
downloadlinux-b1e9cee7f68620fa2a020e35b5fbe3c4cc780e84.tar.bz2
ia64: Remove acpi_get_pxm() usage
The IOMMU, LSAPIC, IOSAPIC, and PCI host bridge code doesn't care about _PXM values directly; it only needs to know what NUMA node the hardware is on. This uses acpi_get_node() directly and removes the _PXM stuff. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/ia64/hp')
-rw-r--r--arch/ia64/hp/common/sba_iommu.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index a52d6b49b7ce..007361d59aa6 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2017,31 +2017,19 @@ sba_connect_bus(struct pci_bus *bus)
printk(KERN_WARNING "No IOC for PCI Bus %04x:%02x in ACPI\n", pci_domain_nr(bus), bus->number);
}
-#ifdef CONFIG_NUMA
static void __init
sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)
{
+#ifdef CONFIG_NUMA
unsigned int node;
- int pxm;
-
- ioc->node = NUMA_NO_NODE;
-
- pxm = acpi_get_pxm(handle);
-
- if (pxm < 0)
- return;
- node = pxm_to_node(pxm);
-
- if (node == NUMA_NO_NODE || !node_online(node))
- return;
+ node = acpi_get_node(handle);
+ if (node != NUMA_NO_NODE && !node_online(node))
+ node = NUMA_NO_NODE;
ioc->node = node;
- return;
-}
-#else
-#define sba_map_ioc_to_node(ioc, handle)
#endif
+}
static int __init
acpi_sba_ioc_add(struct acpi_device *device,