diff options
| author | Hiro Sugawara <hsugawara@nvidia.com> | 2011-08-25 14:14:02 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-29 19:08:55 -0700 |
| commit | 03f5a82c2f5b19507540cc9ea47e3ea3832c69e2 (patch) | |
| tree | 77d83699d04c0b40e8429d60f219325dcfd4d6b8 | |
| parent | 16cd71025169b7bb4dc6b74abf641bd745ab66b5 (diff) | |
arm: tegra: iovmm: Fixed configurablability advertised in Makefile
CONFIG_TEGRA_IOVMM_SMMU now can be independently disabled and
the kernel still builds.
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>
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/iovmm.h | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 6e2468f6fd5f..78168f8f3768 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -22,7 +22,6 @@ config ARCH_TEGRA_3x_SOC select CPU_V7 select ARM_GIC select ARCH_REQUIRE_GPIOLIB - select TEGRA_IOVMM select USB_ARCH_HAS_EHCI if USB_SUPPORT select USB_EHCI_TEGRA if USB_SUPPORT select USB_ULPI if USB_SUPPORT diff --git a/arch/arm/mach-tegra/include/mach/iovmm.h b/arch/arm/mach-tegra/include/mach/iovmm.h index 4341080b7b50..7f34baeacd96 100644 --- a/arch/arm/mach-tegra/include/mach/iovmm.h +++ b/arch/arm/mach-tegra/include/mach/iovmm.h @@ -234,7 +234,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; } @@ -244,6 +244,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) { } |