From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF3C3C4338F for ; Fri, 20 Aug 2021 18:35:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC2FC6113E for ; Fri, 20 Aug 2021 18:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236264AbhHTSgO (ORCPT ); Fri, 20 Aug 2021 14:36:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:57512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229927AbhHTSgM (ORCPT ); Fri, 20 Aug 2021 14:36:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D09B56113D; Fri, 20 Aug 2021 18:35:33 +0000 (UTC) Date: Fri, 20 Aug 2021 19:35:21 +0100 From: Catalin Marinas To: Anshuman Khandual Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , linux-kernel@vger.kernel.org, Mark Rutland Subject: Re: [PATCH V2] arm64/mm: Drop Message-ID: <20210820183520.GC23080@arm.com> References: <1629457516-32306-1-git-send-email-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1629457516-32306-1-git-send-email-anshuman.khandual@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 20, 2021 at 04:35:16PM +0530, Anshuman Khandual wrote: > PAGE_SHIFT (PAGE_SIZE and PAGE_MASK) which is derived from ARM64_PAGE_SHIFT > should be moved into instead like in case for other platforms, > and then subsequently can be just dropped off completely. These were moved to page-def.h as part of commit b6531456ba27 ("arm64: factor out PAGE_* and CONT_* definitions") to avoid some circular header dependencies. > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > index 824a3655dd93..649d26396f9e 100644 > --- a/arch/arm64/include/asm/memory.h > +++ b/arch/arm64/include/asm/memory.h > @@ -12,7 +12,7 @@ > > #include > #include > -#include > +#include In 5.14-rc3, asm/page.h still includes asm/memory.h. -- Catalin