openrisc-add-support-for-folded-p4d-page-tables.patch removed from -mm tree
The patch titled
Subject: openrisc: add support for folded p4d page tables
has been removed from the -mm tree. Its filename was
openrisc-add-support-for-folded-p4d-page-tables.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: openrisc: add support for folded p4d page tables
Implement primitives necessary for the 4th level folding, add walks of p4d level where appropriate and remove usage of __ARCH_USE_5LEVEL_HACK.
---
arch/openrisc/include/asm/pgtable.h | 1 - arch/openrisc/mm/fault.c | 10 ++++++++-- arch/openrisc/mm/init.c | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-)
arch/openrisc/include/asm/pgtable.h renamed from arch/openrisc/include/asm/pgtable.h~openrisc-add-support-for-folded-p4d-page-tables +0 -1
@@ -21,7 +21,6 @@#ifndef __ASM_OPENRISC_PGTABLE_H#define __ASM_OPENRISC_PGTABLE_H -#define __ARCH_USE_5LEVEL_HACK#include <asm-generic/pgtable-nopmd.h> #ifndef __ASSEMBLY__
arch/openrisc/mm/fault.c renamed from arch/openrisc/mm/fault.c~openrisc-add-support-for-folded-p4d-page-tables +8 -2
@@ -295,6 +295,7 @@ vmalloc_fault:int offset =pgd_index (address);pgd_t *pgd, *pgd_k; +p4d_t *p4d, *p4d_k;pud_t *pud, *pud_k;pmd_t *pmd, *pmd_k;pte_t *pte_k;
@@ -321,8 +322,13 @@ vmalloc_fault:* it exists. */ - pud =pud_offset (pgd, address); - pud_k =pud_offset (pgd_k, address); + p4d =p4d_offset (pgd, address); + p4d_k =p4d_offset (pgd_k, address); +if (!p4d_present (*p4d_k)) + goto no_context; + + pud =pud_offset (p4d, address); + pud_k =pud_offset (p4d_k, address);if (!pud_present (*pud_k)) goto no_context;
arch/openrisc/mm/init.c renamed from arch/openrisc/mm/init.c~openrisc-add-support-for-folded-p4d-page-tables +3 -1
@@ -68,6 +68,7 @@ static void __init map_ram(void)unsigned long v, p, e;pgprot_t prot;pgd_t *pge; +p4d_t *p4e;pud_t *pue;pmd_t *pme;pte_t *pte;
@@ -87,7 +88,8 @@ static void __init map_ram(void)while (p < e) {int j; - pue =pud_offset (pge, v); + p4e =p4d_offset (pge, v); + pue =pud_offset (p4e, v); pme =pmd_offset (pue, v);if ((u32 ) pue != (u32 ) pge || (u32 ) pme != (u32 ) pge) {
_
Patches currently in -mm which might be from [email protected] are
mm-dont-include-asm-pgtableh-if-linux-mmh-is-already-included.patch mm-introduce-include-linux-pgtableh.patch mm-reorder-includes-after-introduction-of-linux-pgtableh.patch csky-replace-definitions-of-__pxd_offset-with-pxd_index.patch m68k-mm-motorola-move-comment-about-page-table-allocation-funcitons.patch m68k-mm-move-cachenocahe_page-definitions-close-to-their-user.patch x86-mm-simplify-init_trampoline-and-surrounding-logic.patch x86-mm-simplify-init_trampoline-and-surrounding-logic-fix.patch mm-pgtable-add-shortcuts-for-accessing-kernel-pmd-and-pte.patch mm-pgtable-add-shortcuts-for-accessing-kernel-pmd-and-pte-fix.patch mm-consolidate-pte_index-and-pte_offset_-definitions.patch mm-consolidate-pmd_index-and-pmd_offset-definitions.patch mm-consolidate-pud_index-and-pud_offset-definitions.patch mm-consolidate-pgd_index-and-pgd_offset_k-definitions.patch