From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pb0-f42.google.com (mail-pb0-f42.google.com [209.85.160.42]) by kanga.kvack.org (Postfix) with ESMTP id F245A6B01FE for ; Fri, 8 Nov 2013 18:43:16 -0500 (EST) Received: by mail-pb0-f42.google.com with SMTP id jt11so2827381pbb.1 for ; Fri, 08 Nov 2013 15:43:16 -0800 (PST) Received: from psmtp.com ([74.125.245.147]) by mx.google.com with SMTP id kc2si794159pbc.36.2013.11.08.15.43.14 for ; Fri, 08 Nov 2013 15:43:15 -0800 (PST) From: Santosh Shilimkar Subject: [PATCH 08/24] mm/memblock: drop WARN and use SMP_CACHE_BYTES as a default alignment Date: Fri, 8 Nov 2013 18:41:44 -0500 Message-ID: <1383954120-24368-9-git-send-email-santosh.shilimkar@ti.com> In-Reply-To: <1383954120-24368-1-git-send-email-santosh.shilimkar@ti.com> References: <1383954120-24368-1-git-send-email-santosh.shilimkar@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: tj@kernel.org, linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Grygorii Strashko , Yinghai Lu , Andrew Morton From: Grygorii Strashko drop WARN and use SMP_CACHE_BYTES as a default alignment in memblock_alloc_base_nid() as recommended by Tejun Heo in https://lkml.org/lkml/2013/10/13/117. Cc: Yinghai Lu Cc: Tejun Heo Cc: Andrew Morton Signed-off-by: Grygorii Strashko --- mm/memblock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 88a6a0e..36b795f 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -785,8 +785,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); -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org