The patch titled
Subject: drivers-dma-coherent-add-initialization-from-device-tree-fix-fix
has been removed from the -mm tree. Its filename was
drivers-dma-coherent-add-initialization-from-device-tree-fix-fix.patch
This patch was dropped because it was folded into drivers-dma-coherent-add-initialization-from-device-tree.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: drivers-dma-coherent-add-initialization-from-device-tree-fix-fix
use more appropriate printk facility levels
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Josh Cartwright <joshc@xxxxxxxxxxxxxx>
Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Cc: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/dma-coherent.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/base/dma-coherent.c~drivers-dma-coherent-add-initialization-from-device-tree-fix-fix drivers/base/dma-coherent.c
--- a/drivers/base/dma-coherent.c~drivers-dma-coherent-add-initialization-from-device-tree-fix-fix
+++ a/drivers/base/dma-coherent.c
@@ -283,7 +283,7 @@ static int rmem_dma_device_init(struct r
dma_init_coherent_memory(rmem->base, rmem->base, rmem->size,
DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE,
&mem) != DMA_MEMORY_MAP) {
- pr_info("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
+ pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
&rmem->base, (unsigned long)rmem->size / SZ_1M);
return -ENODEV;
}
@@ -312,7 +312,7 @@ static int __init rmem_dma_setup(struct
#ifdef CONFIG_ARM
if (!of_get_flat_dt_prop(node, "no-map", NULL)) {
- pr_info("Reserved memory: regions without no-map are not yet supported\n");
+ pr_err("Reserved memory: regions without no-map are not yet supported\n");
return -EINVAL;
}
#endif
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-cma-fix-cma-bitmap-aligned-mask-computing-checkpatch-fixes.patch
drivers-dma-coherent-add-initialization-from-device-tree.patch
drivers-dma-coherent-add-initialization-from-device-tree-checkpatch-fixes.patch
drivers-dma-contiguous-add-initialization-from-device-tree-fix-fix.patch
mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
