From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joerg Roedel 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> References: <1433513463-19128-1-git-send-email-joro@8bytes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1433513463-19128-1-git-send-email-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: rwright-VXdhtT5mjnY@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, doug.hatch-VXdhtT5mjnY@public.gmane.org, dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, jroedel-l3A5Bk7waGM@public.gmane.org, tom.vaden-VXdhtT5mjnY@public.gmane.org, lisa.mitchell-VXdhtT5mjnY@public.gmane.org, zhen-hual-VXdhtT5mjnY@public.gmane.org, bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, li.zhang6-VXdhtT5mjnY@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, ishii.hironobu-+CUm20s59erQFUHtdCDX3A@public.gmane.org, dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org List-Id: iommu@lists.linux-foundation.org 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 -- 1.9.1