From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932441Ab3KHXnw (ORCPT ); Fri, 8 Nov 2013 18:43:52 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:53199 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932260Ab3KHXni (ORCPT ); Fri, 8 Nov 2013 18:43:38 -0500 From: Santosh Shilimkar To: , CC: , , Grygorii Strashko , Yinghai Lu , Andrew Morton 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> X-Mailer: git-send-email 1.7.9.5 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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