lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 157/342] MIPS: Fix some missing CONFIG_CPU_MIPSR6 #ifdefs
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Huacai Chen <chenhc@lemote.com>

    commit 4f33f6c522948fffc345261896042b58dea23754 upstream.

    Commit be0c37c985eddc4 (MIPS: Rearrange PTE bits into fixed positions.)
    defines fixed PTE bits for MIPS R2. Then, commit d7b631419b3d230a4d383
    (MIPS: pgtable-bits: Fix XPA damage to R6 definitions.) adds the MIPS
    R6 definitions in the same way as MIPS R2. But some R6 #ifdefs in the
    later commit are missing, so in this patch I fix that.

    Signed-off-by: Huacai Chen <chenhc@lemote.com>
    Cc: Aurelien Jarno <aurelien@aurel32.net>
    Cc: Steven J. Hill <Steven.Hill@imgtec.com>
    Cc: Fuxin Zhang <zhangfx@lemote.com>
    Cc: Zhangjin Wu <wuzhangjin@gmail.com>
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/12164/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/include/asm/pgtable.h | 4 ++--
    arch/mips/mm/tlbex.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/mips/include/asm/pgtable.h
    +++ b/arch/mips/include/asm/pgtable.h
    @@ -353,7 +353,7 @@ static inline pte_t pte_mkdirty(pte_t pt
    static inline pte_t pte_mkyoung(pte_t pte)
    {
    pte_val(pte) |= _PAGE_ACCESSED;
    -#ifdef CONFIG_CPU_MIPSR2
    +#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
    if (!(pte_val(pte) & _PAGE_NO_READ))
    pte_val(pte) |= _PAGE_SILENT_READ;
    else
    @@ -560,7 +560,7 @@ static inline pmd_t pmd_mkyoung(pmd_t pm
    {
    pmd_val(pmd) |= _PAGE_ACCESSED;

    -#ifdef CONFIG_CPU_MIPSR2
    +#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
    if (!(pmd_val(pmd) & _PAGE_NO_READ))
    pmd_val(pmd) |= _PAGE_SILENT_READ;
    else
    --- a/arch/mips/mm/tlbex.c
    +++ b/arch/mips/mm/tlbex.c
    @@ -242,7 +242,7 @@ static void output_pgtable_bits_defines(
    pr_define("_PAGE_HUGE_SHIFT %d\n", _PAGE_HUGE_SHIFT);
    pr_define("_PAGE_SPLITTING_SHIFT %d\n", _PAGE_SPLITTING_SHIFT);
    #endif
    -#ifdef CONFIG_CPU_MIPSR2
    +#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
    if (cpu_has_rixi) {
    #ifdef _PAGE_NO_EXEC_SHIFT
    pr_define("_PAGE_NO_EXEC_SHIFT %d\n", _PAGE_NO_EXEC_SHIFT);
    \
     
     \ /
      Last update: 2016-03-02 02:21    [W:4.066 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site