lkml.org 
[lkml]   [2015]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 074/177] MIPS: tlbex: Fix a missing statement for HUGETLB
    Date
    From: Huacai Chen <chenhc@lemote.com>

    3.4.106-rc1 review patch. If anyone has any objections, please let me know.

    ------------------


    commit 8393c524a25609a30129e4a8975cf3b91f6c16a5 upstream.

    In commit 2c8c53e28f1 (MIPS: Optimize TLB handlers for Octeon CPUs)
    build_r4000_tlb_refill_handler() is modified. But it doesn't compatible
    with the original code in HUGETLB case. Because there is a copy & paste
    error and one line of code is missing. It is very easy to produce a bug
    with LTP's hugemmap05 test.

    Signed-off-by: Huacai Chen <chenhc@lemote.com>
    Signed-off-by: Binbin Zhou <zhoubb@lemote.com>
    Cc: John Crispin <john@phrozen.org>
    Cc: Steven J. Hill <Steven.Hill@imgtec.com>
    Cc: linux-mips@linux-mips.org
    Cc: Fuxin Zhang <zhangfx@lemote.com>
    Cc: Zhangjin Wu <wuzhangjin@gmail.com>
    Patchwork: https://patchwork.linux-mips.org/patch/7496/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    arch/mips/mm/tlbex.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
    index 0bc485b..f5abdfa 100644
    --- a/arch/mips/mm/tlbex.c
    +++ b/arch/mips/mm/tlbex.c
    @@ -1283,6 +1283,7 @@ static void __cpuinit build_r4000_tlb_refill_handler(void)
    }
    #ifdef CONFIG_HUGETLB_PAGE
    uasm_l_tlb_huge_update(&l, p);
    + UASM_i_LW(&p, K0, 0, K1);
    build_huge_update_entries(&p, htlb_info.huge_pte, K1);
    build_huge_tlb_write_entry(&p, &l, &r, K0, tlb_random,
    htlb_info.restore_scratch);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-01-28 05:41    [W:4.339 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site