Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

csky: replace definitions of __pXd_offset() with pXd_index()

All architectures use pXd_index() to get an entry in the page table page
corresponding to a virtual address.

Align csky with other architectures.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200514170327.31389-5-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Mike Rapoport and committed by
Linus Torvalds
c910951a 65fddcfc

+7 -8
+2 -3
arch/csky/include/asm/pgtable.h
··· 229 229 return pte; 230 230 } 231 231 232 - #define __pgd_offset(address) pgd_index(address) 233 - #define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) 234 - #define __pmd_offset(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) 232 + #define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) 233 + #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) 235 234 236 235 /* to find an entry in a kernel page-table-directory */ 237 236 #define pgd_offset_k(address) pgd_offset(&init_mm, address)
+1 -1
arch/csky/mm/fault.c
··· 78 78 * Do _not_ use "tsk" here. We might be inside 79 79 * an interrupt in the middle of a task switch.. 80 80 */ 81 - int offset = __pgd_offset(address); 81 + int offset = pgd_index(address); 82 82 pgd_t *pgd, *pgd_k; 83 83 pud_t *pud, *pud_k; 84 84 pmd_t *pmd, *pmd_k;
+1 -1
arch/csky/mm/highmem.c
··· 92 92 vaddr = PKMAP_BASE; 93 93 fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, swapper_pg_dir); 94 94 95 - pgd = swapper_pg_dir + __pgd_offset(vaddr); 95 + pgd = swapper_pg_dir + pgd_index(vaddr); 96 96 pud = (pud_t *)pgd; 97 97 pmd = pmd_offset(pud, vaddr); 98 98 pte = pte_offset_kernel(pmd, vaddr);
+3 -3
arch/csky/mm/init.c
··· 157 157 unsigned long vaddr; 158 158 159 159 vaddr = start; 160 - i = __pgd_offset(vaddr); 161 - j = __pud_offset(vaddr); 162 - k = __pmd_offset(vaddr); 160 + i = pgd_index(vaddr); 161 + j = pud_index(vaddr); 162 + k = pmd_index(vaddr); 163 163 pgd = pgd_base + i; 164 164 165 165 for ( ; (i < PTRS_PER_PGD) && (vaddr != end); pgd++, i++) {