Merge tag 'ntb-5.11' of git://github.com/jonmason/ntb

[linux-2.6-microblaze.git] / kernel / dma / pool.c

diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
index 1281c0f..5f84e6c 100644 (file)
--- a/kernel/dma/pool.c
+++ b/kernel/dma/pool.c
@@ -5,9 +5,8 @@
  */
 #include <linux/cma.h>
 #include <linux/debugfs.h>
-#include <linux/dma-contiguous.h>
+#include <linux/dma-map-ops.h>
 #include <linux/dma-direct.h>
-#include <linux/dma-noncoherent.h>
 #include <linux/init.h>
 #include <linux/genalloc.h>
 #include <linux/set_memory.h>
@@ -39,9 +38,6 @@ static void __init dma_atomic_pool_debugfs_init(void)
        struct dentry *root;
 
        root = debugfs_create_dir("dma_pools", NULL);
-       if (IS_ERR_OR_NULL(root))
-               return;
-
        debugfs_create_ulong("pool_size_dma", 0400, root, &pool_size_dma);
        debugfs_create_ulong("pool_size_dma32", 0400, root, &pool_size_dma32);
        debugfs_create_ulong("pool_size_kernel", 0400, root, &pool_size_kernel);
@@ -115,7 +111,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,
 #endif
        /*
         * Memory in the atomic DMA pools must be unencrypted, the pools do not
-        * shrink so no re-encryption occurs in dma_direct_free_pages().
+        * shrink so no re-encryption occurs in dma_direct_free().
         */
        ret = set_memory_decrypted((unsigned long)page_to_virt(page),
                                   1 << order);