csky-replace-definitions-of-__pxd_offset-with-pxd_index.patch removed from -mm tree
The patch titled
Subject: csky: replace definitions of __pXd_offset() with pXd_index()
has been removed from the -mm tree. Its filename was
csky-replace-definitions-of-__pxd_offset-with-pxd_index.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: 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 <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Brian Cain <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Chris Zankel <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Greg Ungerer <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc Guo Ren <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Helge Deller <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Ley Foon Tan <[email protected]>
Cc Mark Salter <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Matt Turner <[email protected]>
Cc Max Filippov <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Michal Simek <[email protected]>
Cc Nick Hu <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Rich Felker <[email protected]>
Cc Russell King <[email protected]>
Cc Stafford Horne <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Tony Luck <[email protected]>
Cc Vincent Chen <[email protected]>
Cc Vineet Gupta <[email protected]>
Cc Will Deacon <[email protected]>
Cc Yoshinori Sato <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/csky/include/asm/pgtable.h | 5 ++--- arch/csky/mm/fault.c | 2 +- arch/csky/mm/highmem.c | 2 +- arch/csky/mm/init.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-)
arch/csky/include/asm/pgtable.h renamed from arch/csky/include/asm/pgtable.h~csky-replace-definitions-of-__pxd_offset-with-pxd_index +2 -3
@@ -229,9 +229,8 @@ static inline pte_t pte_mkyoung(pte_t ptreturn pte; } -#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)) +#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) +#define pmd_index (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)
arch/csky/mm/fault.c renamed from arch/csky/mm/fault.c~csky-replace-definitions-of-__pxd_offset-with-pxd_index +1 -1
@@ -78,7 +78,7 @@ asmlinkage void do_page_fault(struct pt_* Do _not_ use "tsk" here. We might be inside * an interrupt in the middle of a task switch.. */ -int offset =__pgd_offset (address); +int offset =pgd_index (address);pgd_t *pgd, *pgd_k;pud_t *pud, *pud_k;pmd_t *pmd, *pmd_k;
arch/csky/mm/highmem.c renamed from arch/csky/mm/highmem.c~csky-replace-definitions-of-__pxd_offset-with-pxd_index +1 -1
@@ -92,7 +92,7 @@ static void __init kmap_pages_init(void) vaddr =PKMAP_BASE ;fixrange_init (vaddr, vaddr +PAGE_SIZE *LAST_PKMAP , swapper_pg_dir); - pgd = swapper_pg_dir +__pgd_offset (vaddr); + pgd = swapper_pg_dir +pgd_index (vaddr); pud = (pud_t *)pgd; pmd =pmd_offset (pud, vaddr); pte =pte_offset_kernel (pmd, vaddr);
arch/csky/mm/init.c renamed from arch/csky/mm/init.c~csky-replace-definitions-of-__pxd_offset-with-pxd_index +3 -3
@@ -157,9 +157,9 @@ void __init fixrange_init(unsigned longunsigned long vaddr; vaddr = start; - i =__pgd_offset (vaddr); - j =__pud_offset (vaddr); - k =__pmd_offset (vaddr); + i =pgd_index (vaddr); + j =pud_index (vaddr); + k =pmd_index (vaddr); pgd = pgd_base + i;for ( ; (i <PTRS_PER_PGD ) && (vaddr != end); pgd++, i++) {
_
Patches currently in -mm which might be from [email protected] are