lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 14/90] sparc64: redefine first version
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Pavel Tatashin <pasha.tatashin@oracle.com>


    [ Upstream commit c4415235b2be0cc791572e8e7f7466ab8f73a2bf ]

    CTX_FIRST_VERSION defines the first context version, but also it defines
    first context. This patch redefines it to only include the first context
    version.

    Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
    Reviewed-by: Bob Picco <bob.picco@oracle.com>
    Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/sparc/include/asm/mmu_64.h | 2 +-
    arch/sparc/mm/init_64.c | 6 +++---
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/arch/sparc/include/asm/mmu_64.h
    +++ b/arch/sparc/include/asm/mmu_64.h
    @@ -52,7 +52,7 @@
    #define CTX_NR_MASK TAG_CONTEXT_BITS
    #define CTX_HW_MASK (CTX_NR_MASK | CTX_PGSZ_MASK)

    -#define CTX_FIRST_VERSION ((_AC(1,UL) << CTX_VERSION_SHIFT) + _AC(1,UL))
    +#define CTX_FIRST_VERSION BIT(CTX_VERSION_SHIFT)
    #define CTX_VALID(__ctx) \
    (!(((__ctx.sparc64_ctx_val) ^ tlb_context_cache) & CTX_VERSION_MASK))
    #define CTX_HWBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_HW_MASK)
    --- a/arch/sparc/mm/init_64.c
    +++ b/arch/sparc/mm/init_64.c
    @@ -656,7 +656,7 @@ EXPORT_SYMBOL(__flush_dcache_range);

    /* get_new_mmu_context() uses "cache + 1". */
    DEFINE_SPINLOCK(ctx_alloc_lock);
    -unsigned long tlb_context_cache = CTX_FIRST_VERSION - 1;
    +unsigned long tlb_context_cache = CTX_FIRST_VERSION;
    #define MAX_CTX_NR (1UL << CTX_NR_BITS)
    #define CTX_BMAP_SLOTS BITS_TO_LONGS(MAX_CTX_NR)
    DECLARE_BITMAP(mmu_context_bmap, MAX_CTX_NR);
    @@ -687,9 +687,9 @@ void get_new_mmu_context(struct mm_struc
    if (new_ctx >= ctx) {
    int i;
    new_ctx = (tlb_context_cache & CTX_VERSION_MASK) +
    - CTX_FIRST_VERSION;
    + CTX_FIRST_VERSION + 1;
    if (new_ctx == 1)
    - new_ctx = CTX_FIRST_VERSION;
    + new_ctx = CTX_FIRST_VERSION + 1;

    /* Don't call memset, for 16 entries that's just
    * plain silly...

    \
     
     \ /
      Last update: 2017-06-12 18:18    [W:4.127 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site