From patchwork Wed Jan 29 18:19:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553641 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 35695C02DC for ; Wed, 29 Jan 2014 18:21:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 681112018E for ; Wed, 29 Jan 2014 18:21:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83EF42018A for ; Wed, 29 Jan 2014 18:21:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752268AbaA2SVR (ORCPT ); Wed, 29 Jan 2014 13:21:17 -0500 Received: from mail-ie0-f176.google.com ([209.85.223.176]:46144 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753394AbaA2ST2 (ORCPT ); Wed, 29 Jan 2014 13:19:28 -0500 Received: by mail-ie0-f176.google.com with SMTP id tp5so2362704ieb.7 for ; Wed, 29 Jan 2014 10:19:28 -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=OBn7PvZtaOspCex2K4VkfIydjGkndwURSZ/H2aFkkJc=; b=F+bd9mDRCfqYOAivuimPaVa/OfWNjjM0VChI/V25ygUJciv7dhAmhIwpMMTJU6aPlq trGBKsrG5ELGAy9OcZc8diJlVAuMGtD5uXdR2UuSNX7d9Nc6jXgVx1tgTMhz9l0cZRdz xnMLLbcWUatPYA0Hn/x5QQFozSzZ+gia50HSgtOsNJVMaoUxHupR+lAkckVd+bqTaKXB Bd1LDBWHlwD3VfdxvINdlwUXM1kcgr+6vs9b0i7+ipi/C7qnVOAflrUnA74E+zWD7SOO RizoUaXF9otEbsrpB0tRLbaazq3eri6bXATZMiXcKGLU1X0mowIi0w9u95Ji98kSAzoz RGYQ== 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=OBn7PvZtaOspCex2K4VkfIydjGkndwURSZ/H2aFkkJc=; b=QHXo3j/JBxjfJ2yd71P/tJFKUHkf3SgEaW3NOUIfqe+21La2ODzkqHsgc+DOE/4Mhr mbHQwyXwubf4LF1kptVyQL/g6muz8h0XgAdMTAvGpfBQJwcZZs2oD6N02abRhtX0TxWr DOlO4XRvBmymV+fOEOsaaFGmU81AXjXF4/YvKDl/pxcWUkfVg30K0nYp/+rzAvvgNkRD A9BUPyWCibqRSDVo9z6CrFh0dGinpUUyH3VumN+VmpWPl6hqvD8NH3TVM2eABynoXVht IPZpo+jVB2OEkWbT9jMT4O1hu3VLd59B9cxfBXh/aA+Ignsts+sJqOXCvIOuHwgqEMv0 G7Lw== X-Gm-Message-State: ALoCoQnibv4s/E/Azv4bRk4W/I/man7ZMDoXuEjuIc5BBUjtGlwRCVktLQODSQQZJIPcXk2KqG1VJ1HC7rIzk1MvMdz6fqCcXLvfrTppDAszzebhD7OCgSmW9X6VtAl3n8IhRJdLooZijkAT9NXNmq5N50d0OMwpTo305756wyFyr8XCBpx8/kVi8QqFG84yzZQGpsRKSrI12aNw/lQp9g12ghzxPmOS8Q3TIGJHm4H5Xrnf5GY7X78= X-Received: by 10.50.120.105 with SMTP id lb9mr30558324igb.22.1391019567866; Wed, 29 Jan 2014 10:19:27 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id y7sm10442400igl.8.2014.01.29.10.19.26 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:19:27 -0800 (PST) Subject: [PATCH 16/17] ACPI / numa: Make __acpi_map_pxm_to_node(), acpi_get_pxm() static 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:19:25 -0700 Message-ID: <20140129181925.15476.24730.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-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@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 __acpi_map_pxm_to_node() and acpi_get_pxm() are only used within drivers/acpi/numa.c. This makes them static and removes their declarations. Signed-off-by: Bjorn Helgaas --- drivers/acpi/numa.c | 4 ++-- include/acpi/acpi_numa.h | 1 - include/linux/acpi.h | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/drivers/acpi/numa.c b/drivers/acpi/numa.c index a7e779bfa2f6..359a43bdd948 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -60,7 +60,7 @@ int node_to_pxm(int node) return node_to_pxm_map[node]; } -void __acpi_map_pxm_to_node(int pxm, int node) +static void __acpi_map_pxm_to_node(int pxm, int node) { if (pxm_to_node_map[pxm] == NUMA_NO_NODE || node < pxm_to_node_map[pxm]) pxm_to_node_map[pxm] = node; @@ -314,7 +314,7 @@ int __init acpi_numa_init(void) return 0; } -int acpi_get_pxm(acpi_handle h) +static int acpi_get_pxm(acpi_handle h) { unsigned long long pxm; acpi_status status; diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index 451823cb8837..94a37cd7fbda 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h @@ -13,7 +13,6 @@ extern int pxm_to_node(int); extern int node_to_pxm(int); -extern void __acpi_map_pxm_to_node(int, int); extern int acpi_map_pxm_to_node(int); extern unsigned char acpi_srat_revision; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 17bee650a0cb..6c29abbefd41 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -259,13 +259,8 @@ 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); #else -static inline int acpi_get_pxm(acpi_handle handle) -{ - return 0; -} static inline int acpi_get_node(acpi_handle handle) { return 0;