From patchwork Wed Jan 29 18:19:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553681 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 EB3E3C02DC for ; Wed, 29 Jan 2014 18:21:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30639201B9 for ; Wed, 29 Jan 2014 18:21:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51799200E7 for ; Wed, 29 Jan 2014 18:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753353AbaA2STU (ORCPT ); Wed, 29 Jan 2014 13:19:20 -0500 Received: from mail-ie0-f180.google.com ([209.85.223.180]:57618 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753351AbaA2STO (ORCPT ); Wed, 29 Jan 2014 13:19:14 -0500 Received: by mail-ie0-f180.google.com with SMTP id at1so2432573iec.39 for ; Wed, 29 Jan 2014 10:19:14 -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=Q/oNqsBdwwcR09ACAtR8rFqJLwSNtmLG83Yng41eXeM=; b=bKPAq7ueWMid3rAE5FhNMlb1tVDXHAIqiG19f+vQXyWiDOFh8MY3wfP5Pc433krNfI Xhh+28tZbGOO+Y6Xo6Uz76R35QuJEogr8NsITWfFoKrsKXUAcFmn2T7x+ywvvhin844Z PZkFOQfmrRSE8+rEzHU34VgPxRat3T/kgHQZg+IwlyweNogm2cOFXkgGaCHuJQpztAJt WiFaovD7jZFZtazJEZeOz2Jj1pN25F8JJUbME9SxN91IVwYY4NxVN/WKxkJklisoVS8k 5aqdGG+dK0zuPE4FBWwbkFSvHqjrjWBWWzST9K9Kp4xrgJVMBIqFi1qHsMFmKU0pdlA4 e8cw== 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=Q/oNqsBdwwcR09ACAtR8rFqJLwSNtmLG83Yng41eXeM=; b=c5e/bacO8PtGw4No+9E70r7rn18vniZfBIusKeUA7bHUF3ug+LqR1HOMhCkAv4BUsk rXKR44X8MsLUxTjZ9XmKh87U9EMGSBiYYWSDt0MihkPXkSKhoWK94Y1IwRfNGOEuAHa7 mBT3M+sHkKzTSGziBqe+ZBNDdgLEfCpK0RElqtl9lsEH5QyMcbjKfQNuVGSFsNa+kDUi 6I95w+j1gIaye7jZloyezJWaAkON0u5FohU9svuL6SwtR7PhM6JQ523r/3B8cYmSI1/X 1GyIs/rdoVzJJCpi/CwDRG8K2gZzNPrwAQRHQsL3UwHQqoGm6PmTOoWCXT4tK7p6VKA3 pR8g== X-Gm-Message-State: ALoCoQn+x/CwzsrN6Uo3BraZtSF8k5QCGZSWDwuqB7cJ6SIPT49Z51C38yanmx4RFMLO8G/1UIaioAezn5MMjKx/8zGx2XTnJTrtYyA7VptWBvReT/84vM1mGEXDJO+hNvZhWf8mEyGmvZ7rqpqBvudS5L2YTRCHCRgC1eWjzvk9gj9tibk5M03nTuT8peokYXjppf1WvKnHOvl89hfozdY5eQO/pQo28Om9OD0kEhPCFbMW0xadaDQ= X-Received: by 10.42.141.193 with SMTP id p1mr2434815icu.61.1391019553886; Wed, 29 Jan 2014 10:19:13 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id ni8sm70372197igb.7.2014.01.29.10.19.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:19:12 -0800 (PST) Subject: [PATCH 14/17] ACPI / numa: Fix acpi_get_node() prototype 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:10 -0700 Message-ID: <20140129181910.15476.66581.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=ham 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_get_node() takes an acpi_handle, not an "acpi_handle *". This fixes the prototype and the definitions. Signed-off-by: Bjorn Helgaas --- drivers/acpi/numa.c | 2 +- include/linux/acpi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 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 9e6816ef280a..dab7dac6b1a8 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -331,7 +331,7 @@ int acpi_get_pxm(acpi_handle h) return -1; } -int acpi_get_node(acpi_handle *handle) +int acpi_get_node(acpi_handle handle) { int pxm, node = NUMA_NO_NODE; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 1151a1dcfe41..17bee650a0cb 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -260,13 +260,13 @@ 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); +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) +static inline int acpi_get_node(acpi_handle handle) { return 0; }