From patchwork Wed Jan 29 18:18:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553781 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A10F9C02DD for ; Wed, 29 Jan 2014 18:23:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF3CA201B4 for ; Wed, 29 Jan 2014 18:23:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46A2E201BB for ; Wed, 29 Jan 2014 18:23:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752056AbaA2SSY (ORCPT ); Wed, 29 Jan 2014 13:18:24 -0500 Received: from mail-ig0-f178.google.com ([209.85.213.178]:35728 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753115AbaA2SSV (ORCPT ); Wed, 29 Jan 2014 13:18:21 -0500 Received: by mail-ig0-f178.google.com with SMTP id uq10so5232821igb.5 for ; Wed, 29 Jan 2014 10:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=6KqiaQ9d2bLW9imvfCFSfeD9cdUjjsmE/nFibeK80tc=; b=fTv0CPlsNiY3vXfZXU7J1sXQT8CQbD4cZJzUL6vVMXsn9k+ZzeG5Ql5i/fL9J72lfx ruOXpocCfmNx06s1cKuoxJYLaJKEVMi/riK8TiATrrP1aFY+mm8xNAz7uTSFshuD2GUu 340L2q9CSe4siVRyLmpby6hDNAmCzefkvN55GHVsLq83PsGwqFFH8ojup3XJsxkG2PhN 2p+bh1efH1YDcNfb4vS5blBOHVIObwL9z9D7LKSyjvq8KxKe6Z8NBe/0K8knZtqppZUT HoDejjY9CNAyD4S0jQkAIWxXc2OpojBmhYmnFeBDAF/1gVnaPX7TlvS4mwu3MjMNSFtU AH5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=6KqiaQ9d2bLW9imvfCFSfeD9cdUjjsmE/nFibeK80tc=; b=RLu2g9EY6yHWdPoFwTs7Kt1yHTeN7XZ5PTCH50j+XcqHVDwNLV2jezxILnvRw55e9I F2acpnspaWg5iCA1N/PyLfpd8xuv1eOxjIuV6KmMftimhERIK3NL3i3RwPeyGwCJzMRa kFmNTSUkT3VfFiHjSEzsLBDimr3Aqo7Owu9f7irPWkLHwdtsaWFIyvb42s1wDvb8RGZ1 d77+NQObJE36lXMPmta9gcmpLbw2Ntal4JxyRrW+3zguwiSlVzGtfE0slCvRNSCvbLwX e9uEqYmgn+X7OKMbCK5FtXW+7zsgN14IikRjvyVIHFzpNafVn6X1cqCeEHv2fhvNycTG QvCg== X-Gm-Message-State: ALoCoQlrf+CxoxndsVPCEtISy2/1w0KTxhjD9MIbnjnFE2ilTLOJrMBKI9zmH85W7a3YaqAd3FIYINH1LfNTqyw50NrU4v2RZBcZT2oKMcCuqft/2yn5wS2Z4IU92NHZTX+WMwO1Y0fA35lCUhYbmxoH/57O/t2atr38Cyy5dbNzNokodbk4mNzTGhkobxTh5xiS/yybdZ81PJ0bCfMX9P2R+gfYs/ckWQ== X-Received: by 10.50.45.33 with SMTP id j1mr30072850igm.32.1391019501102; Wed, 29 Jan 2014 10:18:21 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id ac3sm70365151igd.4.2014.01.29.10.18.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:18:20 -0800 (PST) Subject: [PATCH 07/17] x86/PCI: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node() To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org, x86@kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 29 Jan 2014 11:18:19 -0700 Message-ID: <20140129181819.15476.16563.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140129174106.15476.7075.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140129174106.15476.7075.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This replaces all uses of get_mp_bus_to_node() with x86_pci_root_bus_node(). I think these uses are all on root buses, except possibly for blind probing, where NUMA node information is unimportant. Signed-off-by: Bjorn Helgaas --- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 4f25ec077552..3f42c5c05bf6 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -503,7 +503,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) set_mp_bus_to_node(busnum, node); else #endif - node = get_mp_bus_to_node(busnum); + node = x86_pci_root_bus_node(busnum); if (node != -1 && !node_online(node)) node = -1; diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 600e5925f1a4..f7d6800f10d1 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -467,7 +467,7 @@ void pcibios_scan_root(int busnum) printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum); return; } - sd->node = get_mp_bus_to_node(busnum); + sd->node = x86_pci_root_bus_node(busnum); x86_pci_root_bus_resources(busnum, &resources); printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources);