lkml.org 
[lkml]   [2014]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 019/187] sparc64: Don't use _PAGE_PRESENT in pte_modify() mask.
    Date
    3.13.11.7 -stable review patch.  If anyone has any objections, please let me know.

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

    From: "David S. Miller" <davem@davemloft.net>

    [ Upstream commit eaf85da82669b057f20c4e438dc2566b51a83af6 ]

    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/sparc/include/asm/pgtable_64.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
    index 50b2d78..ac5f708 100644
    --- a/arch/sparc/include/asm/pgtable_64.h
    +++ b/arch/sparc/include/asm/pgtable_64.h
    @@ -258,8 +258,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t prot)
    {
    unsigned long mask, tmp;

    - /* SUN4U: 0x630107ffffffecb8 (negated == 0x9cfef80000001347)
    - * SUN4V: 0x33ffffffffffee17 (negated == 0xcc000000000011e8)
    + /* SUN4U: 0x630107ffffffec38 (negated == 0x9cfef800000013c7)
    + * SUN4V: 0x33ffffffffffee07 (negated == 0xcc000000000011f8)
    *
    * Even if we use negation tricks the result is still a 6
    * instruction sequence, so don't try to play fancy and just
    @@ -289,10 +289,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t prot)
    " .previous\n"
    : "=r" (mask), "=r" (tmp)
    : "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U |
    - _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U | _PAGE_PRESENT_4U |
    + _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U |
    _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4U),
    "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |
    - _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V | _PAGE_PRESENT_4V |
    + _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V |
    _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V));

    return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask));
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-09-16 01:41    [W:4.159 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site