summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2012-08-27 20:27:19 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-08-28 21:01:01 +0200
commit7ce9bf1f4785dab0598a19a7fcb0733a18193e4e (patch)
tree258efa17f0398073cad1dbc0663e587b41a4d30f
parentfea7a08acb13524b47711625eebea40a0ede69a0 (diff)
downloadlinux-7ce9bf1f4785dab0598a19a7fcb0733a18193e4e.tar.gz
linux-7ce9bf1f4785dab0598a19a7fcb0733a18193e4e.tar.bz2
linux-7ce9bf1f4785dab0598a19a7fcb0733a18193e4e.zip
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> Acked-by: Michal Nazarewicz <mina86@mina86.com>
-rw-r--r--drivers/base/dma-contiguous.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 78efb0306a44..34d94c762a1e 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -250,7 +250,7 @@ int __init dma_declare_contiguous(struct device *dev, unsigned long size,
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);