From patchwork Wed Jan 29 18:18:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553471 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9B18B9F382 for ; Wed, 29 Jan 2014 18:19:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3305201D3 for ; Wed, 29 Jan 2014 18:19:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18826201C8 for ; Wed, 29 Jan 2014 18:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753258AbaA2SSp (ORCPT ); Wed, 29 Jan 2014 13:18:45 -0500 Received: from mail-ie0-f179.google.com ([209.85.223.179]:33551 "EHLO mail-ie0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753228AbaA2SSn (ORCPT ); Wed, 29 Jan 2014 13:18:43 -0500 Received: by mail-ie0-f179.google.com with SMTP id ar20so2351720iec.24 for ; Wed, 29 Jan 2014 10:18:43 -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=XqZbipblvZohr6xOx50WXTxqQl4J4R4rllXD1A544zE=; b=Qx1Z/xQjONDEm+tvOZvZyu9NvBzm/ndWIxoOt0TZcxj86DozXFoYnGw5e2mkpksp3C yFZPfUvS9PayyLpPRJgXL8G2UxvnyPyicIwZDmSe8CqER23+FP2wQ5/ZgB3U2IOzmha0 g7yathJ0mnGTguCRHiyHM1k7Y5zaAU20NnunKGNwkrfmBtJdT5o1bO6eYKvW9RVObu5Z vpARTPplInsxYkfTqI9rjhR4Kb5DJR/IpJ09Zq2bmDnxYbI1gD4EUDeyXkvKVwA1G+Ae BAhw3Ole6E4OPxilTSO0TgbXUNA9/gF/w8h0Plsc4q1ZlRVYiT5IxBDUa5cWBy7uWslD OLJw== 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=XqZbipblvZohr6xOx50WXTxqQl4J4R4rllXD1A544zE=; b=mD9DottXcpanwqwnKaC2BFKGLTHP+cK+5lxF8/Emt/a83KhOLYVct5tYaNTeePHle8 CFDMjxOJyuVLWq1td+g5nwIyHgH2Aw1wV9kTb9bLkKFwpZD1RH/SM8Jb3xa5slMZq0un XcIf7tcXBabEYP0fubyUIw2LsTXdsRdlINCZVnCtJBjKp2GACxkCplCfN4AJZEbpaJ8f 9Pzm9Qc5PKppe8pzotPSls5SI4O+L5e31q5IME3mYTHoKxMiuFEjcBTMpLoInHDWsmQh iThRkgdMY8kfr6yNuRy+DjrZpyULP5ptjO8Y8GUxR9+P/5PIrET9UJnaFSw+4RjF1CSL iqSw== X-Gm-Message-State: ALoCoQmPgZBanlf1Shlhe0MCBHjzhePDVC51dmAczNBUSFb0rZguphSQoajngQa+imM0s78O1SPxWCIsAn4l7j5dCHCINUey1pdqXuBQm8Ra0lXgBn5eZmlThPtM3PRn9NFinnLnVTzUw404ewDk8oOwp+y78kZtwSPgfuHOY2Il3eYj2kW0s6HJv7AY1pwzJN8D0rvb31fkqq1OIj7p8MSo1WgA3R3G/w== X-Received: by 10.50.87.201 with SMTP id ba9mr9854122igb.21.1391019523130; Wed, 29 Jan 2014 10:18:43 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id kt2sm78891448igb.1.2014.01.29.10.18.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:18:42 -0800 (PST) Subject: [PATCH 10/17] x86/PCI: Use NUMA_NO_NODE, not -1, for unknown 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:41 -0700 Message-ID: <20140129181841.15476.36375.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 NUMA_NO_NODE is the usual value for "we don't know what node this is on," e.g., it is the error return from acpi_get_node(). This changes uses of -1 to NUMA_NO_NODE. NUMA_NO_NODE is #defined to be -1 already, so this is not a functional change. Signed-off-by: Bjorn Helgaas --- arch/x86/pci/acpi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 78f27efa11e1..6304ea0f426d 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -494,17 +494,17 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) return NULL; } - node = -1; + node = NUMA_NO_NODE; #ifdef CONFIG_ACPI_NUMA pxm = acpi_get_pxm(device->handle); if (pxm >= 0) node = pxm_to_node(pxm); #endif - if (node == -1) + if (node == NUMA_NO_NODE) node = x86_pci_root_bus_node(busnum); - if (node != -1 && !node_online(node)) - node = -1; + if (node != NUMA_NO_NODE && !node_online(node)) + node = NUMA_NO_NODE; info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { @@ -570,7 +570,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) pcie_bus_configure_settings(child); } - if (bus && node != -1) { + if (bus && node != NUMA_NO_NODE) { #ifdef CONFIG_ACPI_NUMA if (pxm >= 0) dev_printk(KERN_DEBUG, &bus->dev,