1 files changed, 2 insertions, 2 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index de4d9c352fd6..6aca54812db0 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -969,8 +969,8 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
 {
         phys_addr_t found;
 
-        if (WARN_ON(!align))
-                align = __alignof__(long long);
+        if (!align)
+                align = SMP_CACHE_BYTES;
 
         /* align @size to avoid excessive fragmentation on reserved array */
         size = round_up(size, align);