[merged] mm-cma-fix-alignment-requirements-for-contiguous-regions.patch removed from -mm tree

[merged] mm-cma-fix-alignment-requirements-for-contiguous-regions.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm: cma: fix alignment requirements for contiguous regions
has been removed from the -mm tree.  Its filename was
     mm-cma-fix-alignment-requirements-for-contiguous-regions.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Marek Szyprowski <m.szyprowski@samsung.com>
Subject: mm: cma: fix alignment requirements for contiguous regions

Contiguous Memory Allocator requires each of its regions to be aligned in
such a way that it is possible to change migration type for all pageblocks
holding it and then isolate page of largest possible order from the buddy
allocator (which is MAX_ORDER-1).  This patch relaxes alignment
requirements by one order, because MAX_ORDER alignment is not really
needed.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/base/dma-contiguous.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/base/dma-contiguous.c~mm-cma-fix-alignment-requirements-for-contiguous-regions drivers/base/dma-contiguous.c
--- a/drivers/base/dma-contiguous.c~mm-cma-fix-alignment-requirements-for-contiguous-regions
+++ a/drivers/base/dma-contiguous.c
@@ -250,7 +250,7 @@ int __init dma_declare_contiguous(struct
 		return -EINVAL;
 
 	/* Sanitise input arguments */
-	alignment = PAGE_SIZE << max(MAX_ORDER, pageblock_order);
+	alignment = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order);
 	base = ALIGN(base, alignment);
 	size = ALIGN(size, alignment);
 	limit &= ~(alignment - 1);
_

Patches currently in -mm which might be from m.szyprowski@samsung.com are

linux-next.patch