diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-24 15:28:42 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-03 10:39:22 -0700 |
| commit | b1e9cee7f68620fa2a020e35b5fbe3c4cc780e84 (patch) | |
| tree | cdedb0185b3602f2a8b8a96e00c4ff43619cbec6 /arch/ia64/pci | |
| parent | 10ee3d7032562d6094d3ee7de84af93fcc0250c7 (diff) | |
| download | linux-b1e9cee7f68620fa2a020e35b5fbe3c4cc780e84.tar.gz linux-b1e9cee7f68620fa2a020e35b5fbe3c4cc780e84.tar.bz2 linux-b1e9cee7f68620fa2a020e35b5fbe3c4cc780e84.zip | |
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/pci')
| -rw-r--r-- | arch/ia64/pci/pci.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 9e4938d8ca4d..291a582777cf 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -126,7 +126,6 @@ static struct pci_controller *alloc_pci_controller(int seg) return NULL; controller->segment = seg; - controller->node = -1; return controller; } @@ -430,19 +429,14 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) struct pci_root_info *info = NULL; int busnum = root->secondary.start; struct pci_bus *pbus; - int pxm, ret; + int ret; controller = alloc_pci_controller(domain); if (!controller) return NULL; controller->companion = device; - - pxm = acpi_get_pxm(device->handle); -#ifdef CONFIG_NUMA - if (pxm >= 0) - controller->node = pxm_to_node(pxm); -#endif + controller->node = acpi_get_node(device->handle); info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { |