Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / lib / lmb.c

diff --git a/lib/lmb.c b/lib/lmb.c
index 896e2832099ea207b36c02af276a0fd2c15516ea..207147ab25e46a90cfa0d17bd703f352c56e2526 100644 (file)
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -346,7 +346,7 @@ u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr)
                        if (j < 0) {
                                /* this area isn't reserved, take it */
                                if (lmb_add_region(&lmb.reserved, base,
-                                                  size) < 0)
+                                                  lmb_align_up(size, align)) < 0)
                                        return 0;
                                return base;
                        }