lkml.org 
[lkml]   [2015]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 03/17] iommu/vt-d: Make two functions static
Date
From: Joerg Roedel <jroedel@suse.de>

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 <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
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


\
 
 \ /
  Last update: 2015-06-05 16:41    [W:1.804 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site