lkml.org 
[lkml]   [2018]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 08/24] powerpc/mm: don't use _PAGE_EXEC in book3s/32
    Date
    book3s/32 doesn't define _PAGE_EXEC, so no need to use it.

    All other platforms define _PAGE_EXEC so no need to check
    it is not NUL when not book3s/32.

    Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    ---
    arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +-
    arch/powerpc/mm/pgtable.c | 6 +++---
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
    index 7a9f0ed599ff..3127cc529aa1 100644
    --- a/arch/powerpc/include/asm/book3s/32/pgtable.h
    +++ b/arch/powerpc/include/asm/book3s/32/pgtable.h
    @@ -234,7 +234,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma,
    int psize)
    {
    unsigned long set = pte_val(entry) &
    - (_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);
    + (_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW);
    unsigned long clr = ~pte_val(entry) & _PAGE_RO;

    pte_update(ptep, clr, set);
    diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
    index aee04b209b51..f97d9c3760e3 100644
    --- a/arch/powerpc/mm/pgtable.c
    +++ b/arch/powerpc/mm/pgtable.c
    @@ -73,7 +73,7 @@ static struct page *maybe_pte_to_page(pte_t pte)
    return page;
    }

    -#if defined(CONFIG_PPC_STD_MMU) || _PAGE_EXEC == 0
    +#ifdef CONFIG_PPC_BOOK3S

    /* Server-style MMU handles coherency when hashing if HW exec permission
    * is supposed per page (currently 64-bit only). If not, then, we always
    @@ -106,7 +106,7 @@ static pte_t set_access_flags_filter(pte_t pte, struct vm_area_struct *vma,
    return pte;
    }

    -#else /* defined(CONFIG_PPC_STD_MMU) || _PAGE_EXEC == 0 */
    +#else /* CONFIG_PPC_BOOK3S */

    /* Embedded type MMU with HW exec support. This is a bit more complicated
    * as we don't have two bits to spare for _PAGE_EXEC and _PAGE_HWEXEC so
    @@ -179,7 +179,7 @@ static pte_t set_access_flags_filter(pte_t pte, struct vm_area_struct *vma,
    return __pte(pte_val(pte) | _PAGE_EXEC);
    }

    -#endif /* !(defined(CONFIG_PPC_STD_MMU) || _PAGE_EXEC == 0) */
    +#endif /* CONFIG_PPC_BOOK3S */

    /*
    * set_pte stores a linux PTE into the linux page table.
    --
    2.13.3
    \
     
     \ /
      Last update: 2018-10-09 15:54    [W:5.360 / U:1.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site