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=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 911A7C43215 for ; Thu, 21 Nov 2019 16:21:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 488E8206D8 for ; Thu, 21 Nov 2019 16:21:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Wf7AOW7H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 488E8206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C31FE6B0352; Thu, 21 Nov 2019 11:21:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BBEB86B0353; Thu, 21 Nov 2019 11:21:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A33FF6B0354; Thu, 21 Nov 2019 11:21:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0035.hostedemail.com [216.40.44.35]) by kanga.kvack.org (Postfix) with ESMTP id 854FF6B0352 for ; Thu, 21 Nov 2019 11:21:47 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 3ED4E440E for ; Thu, 21 Nov 2019 16:21:47 +0000 (UTC) X-FDA: 76180800654.10.pest65_2ca2a1357d105 X-HE-Tag: pest65_2ca2a1357d105 X-Filterd-Recvd-Size: 7929 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Thu, 21 Nov 2019 16:21:46 +0000 (UTC) Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 46743206B6; Thu, 21 Nov 2019 16:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574353305; bh=JukwCNOkYP5D8+BZCp+xHuhbwZfR84EcvIO//Fu8A3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wf7AOW7HPM4KQXSxx45JSkwFCalRhovwcHYS8ee2Sf5bGQKursRvsImFVfKDcGjLt yoP+nkLzHRz55O2ZaJpsmgTqFtgJOOlHbJqZ1sXjZWbvxBw2sbX0Mi4GEdVEYebp3u m3AtG5nvNw41PLWtM90fba9mO/NE0Wcy1tT3c2hQ= From: Mike Rapoport To: Ralf Baechle , Paul Burton , James Hogan Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Mike Rapoport , Mike Rapoport Subject: [PATCH 2/3] mips: drop __pXd_offset() macros that duplicate pXd_index() ones Date: Thu, 21 Nov 2019 18:21:32 +0200 Message-Id: <20191121162133.15833-3-rppt@kernel.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191121162133.15833-1-rppt@kernel.org> References: <20191121162133.15833-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Mike Rapoport The __pXd_offset() macros are identical to the pXd_index() macros and the= re is no point to keep both of them. All architectures define and use pXd_index() so let's keep only those to make mips consistent with the res= t of the kernel. Signed-off-by: Mike Rapoport --- arch/mips/include/asm/pgtable-32.h | 5 +---- arch/mips/include/asm/pgtable-64.h | 4 ---- arch/mips/kvm/mmu.c | 24 ++++++++++++------------ arch/mips/mm/fault.c | 2 +- arch/mips/mm/init.c | 6 +++--- arch/mips/mm/pgtable-32.c | 2 +- 6 files changed, 18 insertions(+), 25 deletions(-) diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/p= gtable-32.h index ba967148b016..6089c5c4936c 100644 --- a/arch/mips/include/asm/pgtable-32.h +++ b/arch/mips/include/asm/pgtable-32.h @@ -196,14 +196,11 @@ static inline pte_t pfn_pte(unsigned long pfn, pgpr= ot_t prot) =20 #define pte_page(x) pfn_to_page(pte_pfn(x)) =20 -#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)) - /* to find an entry in a kernel page-table-directory */ #define pgd_offset_k(address) pgd_offset(&init_mm, address) =20 #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1= )) +#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) =20 /* to find an entry in a page-table-directory */ diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/p= gtable-64.h index 813dfe5f45a5..62a9e2c31312 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h @@ -319,10 +319,6 @@ static inline void pud_clear(pud_t *pudp) #define pfn_pmd(pfn, prot) __pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot= )) #endif =20 -#define __pgd_offset(address) pgd_index(address) -#define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-= 1)) -#define __pmd_offset(address) pmd_index(address) - /* to find an entry in a kernel page-table-directory */ #define pgd_offset_k(address) pgd_offset(&init_mm, address) =20 diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c index 97e538a8c1be..a62a434b256e 100644 --- a/arch/mips/kvm/mmu.c +++ b/arch/mips/kvm/mmu.c @@ -204,8 +204,8 @@ static bool kvm_mips_flush_gpa_pmd(pmd_t *pmd, unsign= ed long start_gpa, { pte_t *pte; unsigned long end =3D ~0ul; - int i_min =3D __pmd_offset(start_gpa); - int i_max =3D __pmd_offset(end_gpa); + int i_min =3D pmd_index(start_gpa); + int i_max =3D pmd_index(end_gpa); bool safe_to_remove =3D (i_min =3D=3D 0 && i_max =3D=3D PTRS_PER_PMD - = 1); int i; =20 @@ -232,8 +232,8 @@ static bool kvm_mips_flush_gpa_pud(pud_t *pud, unsign= ed long start_gpa, { pmd_t *pmd; unsigned long end =3D ~0ul; - int i_min =3D __pud_offset(start_gpa); - int i_max =3D __pud_offset(end_gpa); + int i_min =3D pud_index(start_gpa); + int i_max =3D pud_index(end_gpa); bool safe_to_remove =3D (i_min =3D=3D 0 && i_max =3D=3D PTRS_PER_PUD - = 1); int i; =20 @@ -334,8 +334,8 @@ static int kvm_mips_##name##_pmd(pmd_t *pmd, unsigned= long start, \ int ret =3D 0; \ pte_t *pte; \ unsigned long cur_end =3D ~0ul; \ - int i_min =3D __pmd_offset(start); \ - int i_max =3D __pmd_offset(end); \ + int i_min =3D pmd_index(start); \ + int i_max =3D pmd_index(end); \ int i; \ \ for (i =3D i_min; i <=3D i_max; ++i, start =3D 0) { \ @@ -357,8 +357,8 @@ static int kvm_mips_##name##_pud(pud_t *pud, unsigned= long start, \ int ret =3D 0; \ pmd_t *pmd; \ unsigned long cur_end =3D ~0ul; \ - int i_min =3D __pud_offset(start); \ - int i_max =3D __pud_offset(end); \ + int i_min =3D pud_index(start); \ + int i_max =3D pud_index(end); \ int i; \ \ for (i =3D i_min; i <=3D i_max; ++i, start =3D 0) { \ @@ -862,8 +862,8 @@ static bool kvm_mips_flush_gva_pmd(pmd_t *pmd, unsign= ed long start_gva, { pte_t *pte; unsigned long end =3D ~0ul; - int i_min =3D __pmd_offset(start_gva); - int i_max =3D __pmd_offset(end_gva); + int i_min =3D pmd_index(start_gva); + int i_max =3D pmd_index(end_gva); bool safe_to_remove =3D (i_min =3D=3D 0 && i_max =3D=3D PTRS_PER_PMD - = 1); int i; =20 @@ -890,8 +890,8 @@ static bool kvm_mips_flush_gva_pud(pud_t *pud, unsign= ed long start_gva, { pmd_t *pmd; unsigned long end =3D ~0ul; - int i_min =3D __pud_offset(start_gva); - int i_max =3D __pud_offset(end_gva); + int i_min =3D pud_index(start_gva); + int i_max =3D pud_index(end_gva); bool safe_to_remove =3D (i_min =3D=3D 0 && i_max =3D=3D PTRS_PER_PUD - = 1); int i; =20 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index f589aa8f47d9..524af96c8131 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -292,7 +292,7 @@ static void __kprobes __do_page_fault(struct pt_regs = *regs, unsigned long write, * Do _not_ use "tsk" here. We might be inside * an interrupt in the middle of a task switch.. */ - int offset =3D __pgd_offset(address); + int offset =3D pgd_index(address); pgd_t *pgd, *pgd_k; pud_t *pud, *pud_k; pmd_t *pmd, *pmd_k; diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 090fa653dfa9..50f9ed8c6c1b 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -239,9 +239,9 @@ void __init fixrange_init(unsigned long start, unsign= ed long end, unsigned long vaddr; =20 vaddr =3D start; - i =3D __pgd_offset(vaddr); - j =3D __pud_offset(vaddr); - k =3D __pmd_offset(vaddr); + i =3D pgd_index(vaddr); + j =3D pud_index(vaddr); + k =3D pmd_index(vaddr); pgd =3D pgd_base + i; =20 for ( ; (i < PTRS_PER_PGD) && (vaddr < end); pgd++, i++) { diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c index 6416a531a4c3..621a01fbef64 100644 --- a/arch/mips/mm/pgtable-32.c +++ b/arch/mips/mm/pgtable-32.c @@ -81,7 +81,7 @@ void __init pagetable_init(void) vaddr =3D PKMAP_BASE; fixrange_init(vaddr & PMD_MASK, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base)= ; =20 - pgd =3D swapper_pg_dir + __pgd_offset(vaddr); + pgd =3D swapper_pg_dir + pgd_index(vaddr); pud =3D pud_offset(pgd, vaddr); pmd =3D pmd_offset(pud, vaddr); pte =3D pte_offset_kernel(pmd, vaddr); --=20 2.24.0