From patchwork Fri Jun 5 14:10:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 6554591 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 59254C0020 for ; Fri, 5 Jun 2015 14:19:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 651F62070C for ; Fri, 5 Jun 2015 14:19:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 741D120689 for ; Fri, 5 Jun 2015 14:19:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423365AbbFEORn (ORCPT ); Fri, 5 Jun 2015 10:17:43 -0400 Received: from 8bytes.org ([81.169.241.247]:59103 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423017AbbFEOLM (ORCPT ); Fri, 5 Jun 2015 10:11:12 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 30F0650E; Fri, 5 Jun 2015 16:11:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1433513471; bh=4geIfbNbC36MvygigZEVYkCx2unmWHN1bupBtFyLFF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ww+VUdtPvGQy2W+USi5561DvPXfK0V6/mxg4Wx7lOdPV+KmkaShY8gqAqjyAgeLgy f5fNi9MKHueXOjf3YpcBASo9y2LYDLHL9jFPM3/LF47aMQTbSyP66CF8S2E8nxnDjf eVNfDIklMmPRGf+hc7XZvZNNW3dgZmWqC/vWWAmO/SU0o1r4ac1azHRUlkY8xBNp6p 4V37mDiA93CRU0ZjFlb1GivInJHhzpV/HfoNo6DLdM4Oc/zJJeM+k3gsjXmQIefcwl TN8zEPTU4RD4WePth/mV8bxoze6cT+GaNYcsZwPoNmfoeLbWQpdSL51sUwt+Y0EiyP zD2apQmqPhTcw== From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: zhen-hual@hp.com, bhe@redhat.com, dwmw2@infradead.org, vgoyal@redhat.com, dyoung@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, ishii.hironobu@jp.fujitsu.com, indou.takao@jp.fujitsu.com, bhelgaas@google.com, doug.hatch@hp.com, jerry.hoemann@hp.com, tom.vaden@hp.com, li.zhang6@hp.com, lisa.mitchell@hp.com, billsumnerlinux@gmail.com, rwright@hp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, kexec@lists.infradead.org, joro@8bytes.org, jroedel@suse.de Subject: [PATCH 03/17] iommu/vt-d: Make two functions static Date: Fri, 5 Jun 2015 16:10:49 +0200 Message-Id: <1433513463-19128-4-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433513463-19128-1-git-send-email-joro@8bytes.org> References: <1433513463-19128-1-git-send-email-joro@8bytes.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 From: Joerg Roedel These functions are only used in intel-iommu.c and can be static: * __iommu_load_from_oldmem() * __iommu_free_mapped_mem() Tested-by: Baoquan He Signed-off-by: Joerg Roedel --- drivers/iommu/intel-iommu.c | 5 +++-- include/linux/intel-iommu.h | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index a061c3f..982b8c8 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4942,7 +4942,8 @@ static struct context_entry *device_to_existing_context_entry( /* * Copy memory from a physically-addressed area into a virtually-addressed area */ -int __iommu_load_from_oldmem(void *to, unsigned long from, unsigned long size) +static int __iommu_load_from_oldmem(void *to, unsigned long from, + unsigned long size) { unsigned long pfn; /* Page Frame Number */ size_t csize = (size_t)size; /* Num(bytes to copy) */ @@ -4980,7 +4981,7 @@ int __iommu_load_from_oldmem(void *to, unsigned long from, unsigned long size) /* * Free the mapped memory for ioremap; */ -int __iommu_free_mapped_mem(void) +static int __iommu_free_mapped_mem(void) { struct iommu_remapped_entry *mem_entry, *tmp; diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 9526c28..7e771c2 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -391,8 +391,4 @@ extern int dmar_ir_support(void); extern const struct attribute_group *intel_iommu_groups[]; -extern int __iommu_load_from_oldmem(void *to, unsigned long from, - unsigned long size); -extern int __iommu_free_mapped_mem(void); - #endif