Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64

Pull arm64 changes from Catalin Marinas:
 "arm64 fixes:
   - Use swiotlb_init() instead of swiotlb_init_with_default_size().
     The latter is now a static function (commit 74838b75379a "swiotlb:
     add the late swiotlb initialization function with iotlb memory").
   - Enable interrupts before calling do_notify_resume().

  arm64 clean-up:
   - Use the generic implementation of compat_sys_sendfile() on arm64 as
     commit 8f9c0119d7ba (introducing the function) has been merged."

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: Enable interrupts before calling do_notify_resume()
  arm64: Use the generic compat_sys_sendfile() implementation
  arm64: Call swiotlb_init() instead of swiotlb_init_with_default_size()

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 5eb244453a5..4bd7579ec9e 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -61,12 +61,10 @@ static struct dma_map_ops arm64_swiotlb_dma_ops = {
 	.mapping_error = swiotlb_dma_mapping_error,
 };
 
-void __init swiotlb_init_with_default_size(size_t default_size, int verbose);
-
-void __init arm64_swiotlb_init(size_t max_size)
+void __init arm64_swiotlb_init(void)
 {
 	dma_ops = &arm64_swiotlb_dma_ops;
-	swiotlb_init_with_default_size(min((size_t)SZ_64M, max_size), 1);
+	swiotlb_init(1);
 }
 
 #define PREALLOC_DMA_DEBUG_ENTRIES	4096