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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, 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 256E2C432BE for ; Tue, 31 Aug 2021 03:44:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0032E6103D for ; Tue, 31 Aug 2021 03:44:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239749AbhHaDp1 (ORCPT ); Mon, 30 Aug 2021 23:45:27 -0400 Received: from foss.arm.com ([217.140.110.172]:50670 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239631AbhHaDpZ (ORCPT ); Mon, 30 Aug 2021 23:45:25 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F1C021FB; Mon, 30 Aug 2021 20:44:30 -0700 (PDT) Received: from [10.163.72.217] (unknown [10.163.72.217]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 772CD3F5A1; Mon, 30 Aug 2021 20:44:29 -0700 (PDT) Subject: Re: [PATCH V2] arm64/mm: Drop To: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , linux-kernel@vger.kernel.org, Mark Rutland References: <1629457516-32306-1-git-send-email-anshuman.khandual@arm.com> <20210820183520.GC23080@arm.com> From: Anshuman Khandual Message-ID: <84b647b6-9cee-5aad-78f8-7bc253300534@arm.com> Date: Tue, 31 Aug 2021 09:15:30 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210820183520.GC23080@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/21/21 12:05 AM, Catalin Marinas wrote: > 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. Dropping from does not seem to cause any problem, will change that. Afterwards build tested it across page sizes and also with some random configs. Is that circular dependency still present ? Also wondering why was included in to begin with ? 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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 ACA8EC432BE for ; Tue, 31 Aug 2021 03:48:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64F4061039 for ; Tue, 31 Aug 2021 03:48:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 64F4061039 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=flXPKcFgJIakWsNRJp4GwO1JVld5T2ew4ELaxxuedH8=; b=gyjowV3TxzHDMW9+GiK7bq7Vr2 CqXYVWGHUDsLI+XjAQI3tS/Ot2KrXVg67UnZchd17Qnkyk16i9mggcLZCL8o6D5/imCXovWuPZWks 2S0um3lmcDVTDvdOpRutQ8EJgZjLit1rA7hSft49xLMmIz/fFac5oyr73zbBcHvrv8K74jOGFSXj4 Mq6WhB76J/LFZ9ipyAG1zwzcHGuhcnFxrfAxf7BUOxrvja2d9N5buFSQxawpPVgoCff9Fi6aBpwGg 0WOBbYFcyQqQZtTKBFQSl80W8S7Vf7ipKMFgnAZ93S2ATHtfqkgQJiT07XmtykS+KseGD8MZCaKYa ZJhCCtCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKujP-001F7R-Se; Tue, 31 Aug 2021 03:46:40 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKuhP-001EZ2-Eh for linux-arm-kernel@lists.infradead.org; Tue, 31 Aug 2021 03:44:37 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F1C021FB; Mon, 30 Aug 2021 20:44:30 -0700 (PDT) Received: from [10.163.72.217] (unknown [10.163.72.217]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 772CD3F5A1; Mon, 30 Aug 2021 20:44:29 -0700 (PDT) Subject: Re: [PATCH V2] arm64/mm: Drop To: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , linux-kernel@vger.kernel.org, Mark Rutland References: <1629457516-32306-1-git-send-email-anshuman.khandual@arm.com> <20210820183520.GC23080@arm.com> From: Anshuman Khandual Message-ID: <84b647b6-9cee-5aad-78f8-7bc253300534@arm.com> Date: Tue, 31 Aug 2021 09:15:30 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210820183520.GC23080@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210830_204435_631340_F066597E X-CRM114-Status: GOOD ( 14.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 8/21/21 12:05 AM, Catalin Marinas wrote: > 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. Dropping from does not seem to cause any problem, will change that. Afterwards build tested it across page sizes and also with some random configs. Is that circular dependency still present ? Also wondering why was included in to begin with ? _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel