diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 22:31:23 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 22:31:23 (GMT) |
| commit | 4de5167ee07f7a9b66d999e40f2c3193d1a08add (patch) | |
| tree | 6458e3c033ace5f623046b92f90be9408db5deec /arch/arm/include | |
| parent | b9a5e5e18fbf223502c0b2264c15024e393da928 (diff) | |
| parent | ff284f37fc0e6f3b51ede85c5944d571b640ac0f (diff) | |
| download | linux-4de5167ee07f7a9b66d999e40f2c3193d1a08add.tar.xz | |
Merge branches 'acpi-init' and 'acpica'
* acpi-init:
ACPI / init: Fix the ordering of acpi_reserve_resources()
* acpica:
Revert "ACPICA: Permanently set _REV to the value '2'."
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/dma-iommu.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/xen/page.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-iommu.h b/arch/arm/include/asm/dma-iommu.h index 8e3fcb9..2ef282f 100644 --- a/arch/arm/include/asm/dma-iommu.h +++ b/arch/arm/include/asm/dma-iommu.h @@ -25,7 +25,7 @@ struct dma_iommu_mapping { }; struct dma_iommu_mapping * -arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size); +arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size); void arm_iommu_release_mapping(struct dma_iommu_mapping *mapping); diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h index 2f7e6ff..0b579b2 100644 --- a/arch/arm/include/asm/xen/page.h +++ b/arch/arm/include/asm/xen/page.h @@ -110,5 +110,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) bool xen_arch_need_swiotlb(struct device *dev, unsigned long pfn, unsigned long mfn); +unsigned long xen_get_swiotlb_free_pages(unsigned int order); #endif /* _ASM_ARM_XEN_PAGE_H */ |