summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/include/mach/iovmm.h
diff options
context:
space:
mode:
authorHiro Sugawara <hsugawara@nvidia.com>2011-08-25 14:14:02 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:48:45 -0800
commitd1bbe4c51983ac04e578862cf254f44efeda75c6 (patch)
tree1d5e9150bdc4479f2b86b8b26ce2a4eb86da6a59 /arch/arm/mach-tegra/include/mach/iovmm.h
parent770fe0cb5c0d6d549f3a71fc852297485cfa0a38 (diff)
arm: tegra: iovmm: Fixed configurablability advertised in Makefile
CONFIG_TEGRA_IOVMM_SMMU now can be independently disabled and the kernel still builds. Original-Change-Id: I009319352f4b125941a58132d2be8d5f36411aab Reviewed-on: http://git-master/r/49278 Tested-by: Hiro Sugawara <hsugawara@nvidia.com> Reviewed-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Rebase-Id: Rb663949db3e3fcfa6418f71cdc74662dded08fc6
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/iovmm.h')
-rw-r--r--arch/arm/mach-tegra/include/mach/iovmm.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/include/mach/iovmm.h b/arch/arm/mach-tegra/include/mach/iovmm.h
index 80c68b237bf9..c5abd4debf69 100644
--- a/arch/arm/mach-tegra/include/mach/iovmm.h
+++ b/arch/arm/mach-tegra/include/mach/iovmm.h
@@ -224,7 +224,7 @@ static inline void tegra_iovmm_client_unlock(struct tegra_iovmm_client *client)
static inline struct tegra_iovmm_area *tegra_iovmm_create_vm(
struct tegra_iovmm_client *client, struct tegra_iovmm_area_ops *ops,
- unsigned long size, pgprot_t pgprot, unsigned long iovm_start)
+ size_t size, size_t align, pgprot_t pgprot, unsigned long iovm_start)
{
return NULL;
}
@@ -234,6 +234,10 @@ static inline void tegra_iovmm_zap_vm(struct tegra_iovmm_area *vm) { }
static inline void tegra_iovmm_unzap_vm(struct tegra_iovmm_area *vm) { }
static inline void tegra_iovmm_free_vm(struct tegra_iovmm_area *vm) { }
+static inline size_t tegra_iovmm_get_max_free(struct tegra_iovmm_client *client)
+{
+ return 0;
+}
static inline void tegra_iovmm_vm_insert_pfn(struct tegra_iovmm_area *area,
tegra_iovmm_addr_t vaddr, unsigned long pfn) { }