From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751817AbcDOXQ5 (ORCPT <rfc822;w@1wt.eu>);
	Fri, 15 Apr 2016 19:16:57 -0400
Received: from mailapp01.imgtec.com ([195.59.15.196]:13795 "EHLO
	imgpgp01.kl.imgtec.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1750967AbcDOXQ4 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 15 Apr 2016 19:16:56 -0400
X-PGP-Universal: processed;
	by imgpgp01.kl.imgtec.org on Sat, 16 Apr 2016 00:16:54 +0100
Date: Sat, 16 Apr 2016 00:16:53 +0100
From: James Hogan <james.hogan@imgtec.com>
To: Paul Burton <paul.burton@imgtec.com>
CC: <linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org>,
        "Paul Gortmaker" <paul.gortmaker@windriver.com>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 06/12] MIPS: mm: Unify pte_page definition
Message-ID: <20160415231653.GK7859@jhogan-linux.le.imgtec.org>
References: <1460716620-13382-1-git-send-email-paul.burton@imgtec.com>
 <1460716620-13382-7-git-send-email-paul.burton@imgtec.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="9RxwyT9MtfFuvYYZ"
Content-Disposition: inline
In-Reply-To: <1460716620-13382-7-git-send-email-paul.burton@imgtec.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Originating-IP: [192.168.154.110]
X-ESG-ENCRYPT-TAG: ebfc6934
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--9RxwyT9MtfFuvYYZ
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Apr 15, 2016 at 11:36:54AM +0100, Paul Burton wrote:
> The same definition for pte_page is duplicated for the MIPS32
> PHYS_ADDR_T_64BIT case & the generic case. Unify them by moving a single
> definition outside of preprocessor conditionals.
>=20
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>

Reviewed-by: James Hogan <james.hogan@imgtec.com>

Cheers
James

> ---
>=20
>  arch/mips/include/asm/pgtable-32.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>=20
> diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/p=
gtable-32.h
> index 832e216..181bd8e 100644
> --- a/arch/mips/include/asm/pgtable-32.h
> +++ b/arch/mips/include/asm/pgtable-32.h
> @@ -104,7 +104,7 @@ static inline void pmd_clear(pmd_t *pmdp)
>  }
> =20
>  #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
> -#define pte_page(x)		pfn_to_page(pte_pfn(x))
> +
>  #define pte_pfn(x)		(((unsigned long)((x).pte_high >> _PFN_SHIFT)) | (un=
signed long)((x).pte_low << _PAGE_PRESENT_SHIFT))
>  static inline pte_t
>  pfn_pte(unsigned long pfn, pgprot_t prot)
> @@ -120,8 +120,6 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
> =20
>  #else
> =20
> -#define pte_page(x)		pfn_to_page(pte_pfn(x))
> -
>  #ifdef CONFIG_CPU_VR41XX
>  #define pte_pfn(x)		((unsigned long)((x).pte >> (PAGE_SHIFT + 2)))
>  #define pfn_pte(pfn, prot)	__pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_va=
l(prot))
> @@ -131,6 +129,8 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
>  #endif
>  #endif /* defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32=
) */
> =20
> +#define pte_page(x)		pfn_to_page(pte_pfn(x))
> +
>  #define __pgd_offset(address)	pgd_index(address)
>  #define __pud_offset(address)	(((address) >> PUD_SHIFT) & (PTRS_PER_PUD-=
1))
>  #define __pmd_offset(address)	(((address) >> PMD_SHIFT) & (PTRS_PER_PMD-=
1))
> --=20
> 2.8.0
>=20

--9RxwyT9MtfFuvYYZ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJXEXZlAAoJEGwLaZPeOHZ6QRwP/j2/X9XM4Y48OY0n9w72iKBR
fqBkr2PT27dTmliEpTgEqgMi1KO1Zapq37iMlPLVVWlealHZ0TJFWg3jMvgWuX42
vVmiWyK8Ws/HrJcYw7To5uYkpP7lwVuKDDF6OW/3+j2mXi4eVp3cCYrofw+USE1V
fToS/HfpJE91Fuhp4VjIHVdpxTBw4sgWrHfR9nLUhSBxyJE3+kEYatHR85LzNQGE
xJoCpqpOIcCA6a5yunWxsnJeuMQrIni/q+JPXKxi8orYcDXjU4i17f3WFsl4AUNl
bDw8AVEQHUe88yVLTbFz8VJbKbk3hT34YfqQYpFV9L5N3KB2jtEjE9gIeCeEMnwH
ivob2Pp+vSjfzY93za55XvPOGJ5ht3FraohQoS3tBLYz7CMEcG5oJyQKxH8Y5KeX
F/A/oC3Tqu3Wel2GqjTxWyuNJOZ1YWXjCgz08SmHpHNaL7JdbIOkLqnj79Kgsrca
gmMlVblLhZu87lNAI4HFAJL5zXrL6BXIHJVwj4V1m1WnOq6785wy9YYPA7q2r0tD
CXHaONUbemt4mV/FWqfQT4WwcSAxizpzbwc08J2+ggKWTOTHlwkofRuX+yyQUoU0
DJmoPJeWXVjRqrKyLm1GIez8uK/LE/8ekvM5hbPUBccGfuxdNezwo2CPOIqk1/9D
FogaEx82SYrEyILbiwGI
=BBva
-----END PGP SIGNATURE-----

--9RxwyT9MtfFuvYYZ--