lkml.org 
[lkml]   [2021]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 090/120] [PATCH] Revert "MIPS: add PMD table accounting into MIPSpmd_alloc_one"
    Date
    From: Huang Pei <huangpei@loongson.cn>

    This reverts commit 68046cc531577b8f0ebe67ccf18b9c70106d7937 which is
    commit ed914d48b6a1040d1039d371b56273d422c0081e upstream.

    Commit b2b29d6d011944 (mm: account PMD tables like PTE tables) is
    introduced between v5.9 and v5.10, so this fix (commit 002d8b395fa1)
    should NOT apply to any pre-5.10 branch.

    Signed-off-by: Huang Pei <huangpei@loongson.cn>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/mips/include/asm/pgalloc.h | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    --- a/arch/mips/include/asm/pgalloc.h
    +++ b/arch/mips/include/asm/pgalloc.h
    @@ -93,15 +93,11 @@ do { \

    static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
    {
    - pmd_t *pmd = NULL;
    - struct page *pg;
    + pmd_t *pmd;

    - pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
    - if (pg) {
    - pgtable_pmd_page_ctor(pg);
    - pmd = (pmd_t *)page_address(pg);
    + pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
    + if (pmd)
    pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
    - }
    return pmd;
    }


    \
     
     \ /
      Last update: 2021-07-26 18:22    [W:4.039 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site