Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4415235 authored by Pavel Tatashin's avatar Pavel Tatashin Committed by David S. Miller
Browse files

sparc64: redefine first version 



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: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: default avatarBob Picco <bob.picco@oracle.com>
Reviewed-by: default avatarSteven Sistare <steven.sistare@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14d0334c

arch/sparc/include/asm/mmu_64.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/sparc/mm/init_64.c

+3 −3
Original line number Diff line number Diff line
@@ -707,7 +707,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);
@@ -738,9 +738,9 @@ void get_new_mmu_context(struct mm_struct *mm) 
		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...