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=-3.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 D802AC433DF for ; Thu, 4 Jun 2020 08:38:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B385C20738 for ; Thu, 4 Jun 2020 08:38:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="BRJKJNTE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727868AbgFDIiJ (ORCPT ); Thu, 4 Jun 2020 04:38:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbgFDIiI (ORCPT ); Thu, 4 Jun 2020 04:38:08 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40495C05BD1E; Thu, 4 Jun 2020 01:38:08 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49czgf4R3Sz9sSf; Thu, 4 Jun 2020 18:38:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1591259886; bh=Fw81xUNRxSEfr/K2a41wO/SlsASJNJ6ZEGKglcUTBhU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BRJKJNTELzccZZlcQ6aC+MJCXwoHaorwVDckpFcIW+elWGhu5ytiSMqUSYA7u7m4/ 1LjQOJr7oKKQgaMuL4yPS6aOrqIEneuvMe0Vizwjm4jrQj+RhBrcpIQ1mjs+lGargc hjdOZACWqzp1XB8uoAFQi3E1onhKNn2Z6/cZ7sC0xGjnm5hNFuEOFw77nVnZNDwmgx sAtwhadQZS/86XPNI3OtljWczqHFZXr/53kBThoq7ZOiaZQbneNccEh6a1knTTVJPd MwxiB7YdROQninB0Mn7v+nTOBRmN5KXrW94buNHe2A4eGDXFkNAKanJN25cgSqbhYV D/6udXo/aGZtg== Date: Thu, 4 Jun 2020 18:38:05 +1000 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman Cc: Linux Next Mailing List , Linux Kernel Mailing List , PowerPC Subject: Re: linux-next: fix ups for clashes between akpm and powerpc trees Message-ID: <20200604183805.6f384b23@canb.auug.org.au> In-Reply-To: <20200604165246.436f02ba@canb.auug.org.au> References: <20200603202655.0ad0eacc@canb.auug.org.au> <20200604165246.436f02ba@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/SvRqq+9lvuVyD6gXBTM7iQ2"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/SvRqq+9lvuVyD6gXBTM7iQ2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell w= rote: > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/= include/asm/book3s/64/pgtable.h > index 25c3cb8272c0..a6799723cd98 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -1008,6 +1008,12 @@ extern struct page *p4d_page(p4d_t p4d); > #define pud_page_vaddr(pud) __va(pud_val(pud) & ~PUD_MASKED_BITS) > #define p4d_page_vaddr(p4d) __va(p4d_val(p4d) & ~P4D_MASKED_BITS) > =20 > +static inline unsigned long pgd_index(unsigned long address) > +{ > + return (address >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1); > +} > +#define pgd_index pgd_index > + > #define pte_ERROR(e) \ > pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) > #define pmd_ERROR(e) \ I have added that hunk to linux-next for tomorrow as a fix for mm-consolidate-pgd_index-and-pgd_offset_k-definitions. Its not strickly necessary, but Michael expressed a preference for the inline function. I was wondering if pgd_index "Must be a compile-time constant" on one (or a few) architectures, then why not leave the default as an inline function and special case it as a macro where needed ... --=20 Cheers, Stephen Rothwell --Sig_/SvRqq+9lvuVyD6gXBTM7iQ2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7Ysu0ACgkQAVBC80lX 0GwIpAf9HNqmGtGniydmF0H4hLlZjKycJ6U7wVQBWTZh40QmaBNhJo4Cq2mG4U0u SGEKP3LMv8GVAo6lyLyoIv53uAYcmrWv3L7iIAyd+1EPz44VURGXudmTXdLTH8mw s4jNwXbVxEOADoRs5r+cF/8+bofKdqC3ehJcd24NU9VEbadfcHOdGMfAVSyk6+Ox 10pI2Wd1u4SxS/PS6j/XJU+6EZMyCz5TYFAsAnZzL/09NxqShgcz7f/Wp7vN3KUQ g72Ar0TulShJoWwbn3GOuqznN5nkkmMQSWd/1RyIs///jaDTKw4W28Wq8GkBEjdU S3RU07Z4DFQCS9UIQVm49RYneteAbw== =/0oI -----END PGP SIGNATURE----- --Sig_/SvRqq+9lvuVyD6gXBTM7iQ2-- 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=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 DB993C433DF for ; Thu, 4 Jun 2020 08:39:55 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 E8C01206DC for ; Thu, 4 Jun 2020 08:39:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="BRJKJNTE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8C01206DC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49czjh2mVczDqgp for ; Thu, 4 Jun 2020 18:39:52 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49czgg0x6fzDqfb for ; Thu, 4 Jun 2020 18:38:07 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=BRJKJNTE; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49czgf4R3Sz9sSf; Thu, 4 Jun 2020 18:38:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1591259886; bh=Fw81xUNRxSEfr/K2a41wO/SlsASJNJ6ZEGKglcUTBhU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BRJKJNTELzccZZlcQ6aC+MJCXwoHaorwVDckpFcIW+elWGhu5ytiSMqUSYA7u7m4/ 1LjQOJr7oKKQgaMuL4yPS6aOrqIEneuvMe0Vizwjm4jrQj+RhBrcpIQ1mjs+lGargc hjdOZACWqzp1XB8uoAFQi3E1onhKNn2Z6/cZ7sC0xGjnm5hNFuEOFw77nVnZNDwmgx sAtwhadQZS/86XPNI3OtljWczqHFZXr/53kBThoq7ZOiaZQbneNccEh6a1knTTVJPd MwxiB7YdROQninB0Mn7v+nTOBRmN5KXrW94buNHe2A4eGDXFkNAKanJN25cgSqbhYV D/6udXo/aGZtg== Date: Thu, 4 Jun 2020 18:38:05 +1000 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman Subject: Re: linux-next: fix ups for clashes between akpm and powerpc trees Message-ID: <20200604183805.6f384b23@canb.auug.org.au> In-Reply-To: <20200604165246.436f02ba@canb.auug.org.au> References: <20200603202655.0ad0eacc@canb.auug.org.au> <20200604165246.436f02ba@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/SvRqq+9lvuVyD6gXBTM7iQ2"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , PowerPC , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" --Sig_/SvRqq+9lvuVyD6gXBTM7iQ2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 4 Jun 2020 16:52:46 +1000 Stephen Rothwell w= rote: > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/= include/asm/book3s/64/pgtable.h > index 25c3cb8272c0..a6799723cd98 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -1008,6 +1008,12 @@ extern struct page *p4d_page(p4d_t p4d); > #define pud_page_vaddr(pud) __va(pud_val(pud) & ~PUD_MASKED_BITS) > #define p4d_page_vaddr(p4d) __va(p4d_val(p4d) & ~P4D_MASKED_BITS) > =20 > +static inline unsigned long pgd_index(unsigned long address) > +{ > + return (address >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1); > +} > +#define pgd_index pgd_index > + > #define pte_ERROR(e) \ > pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) > #define pmd_ERROR(e) \ I have added that hunk to linux-next for tomorrow as a fix for mm-consolidate-pgd_index-and-pgd_offset_k-definitions. Its not strickly necessary, but Michael expressed a preference for the inline function. I was wondering if pgd_index "Must be a compile-time constant" on one (or a few) architectures, then why not leave the default as an inline function and special case it as a macro where needed ... --=20 Cheers, Stephen Rothwell --Sig_/SvRqq+9lvuVyD6gXBTM7iQ2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7Ysu0ACgkQAVBC80lX 0GwIpAf9HNqmGtGniydmF0H4hLlZjKycJ6U7wVQBWTZh40QmaBNhJo4Cq2mG4U0u SGEKP3LMv8GVAo6lyLyoIv53uAYcmrWv3L7iIAyd+1EPz44VURGXudmTXdLTH8mw s4jNwXbVxEOADoRs5r+cF/8+bofKdqC3ehJcd24NU9VEbadfcHOdGMfAVSyk6+Ox 10pI2Wd1u4SxS/PS6j/XJU+6EZMyCz5TYFAsAnZzL/09NxqShgcz7f/Wp7vN3KUQ g72Ar0TulShJoWwbn3GOuqznN5nkkmMQSWd/1RyIs///jaDTKw4W28Wq8GkBEjdU S3RU07Z4DFQCS9UIQVm49RYneteAbw== =/0oI -----END PGP SIGNATURE----- --Sig_/SvRqq+9lvuVyD6gXBTM7iQ2--