evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SPARC64]: Fix incorrect TSB lock bit handling.

Browse source 
The TSB_LOCK_BIT define is actually a special
value shifted down by 32-bits for the assembler
code macros.

In C code, this isn't what we want.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-01-31 18:32:44 -08:00 • committed by David S. Miller
parent 96c6e0d8e2
commit 4753eb2ac7
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc64/mm/tsb.c
View file

@ -184,7 +184,7 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size,
: "=r" (tag), "=r" (pte) : "=r" (tag), "=r" (pte)
: "r" (&old_tsb[i]), "i" (ASI_NUCLEUS_QUAD_LDD)); : "r" (&old_tsb[i]), "i" (ASI_NUCLEUS_QUAD_LDD));
if (!tag || (tag & TSB_TAG_LOCK)) if (!tag || (tag & (1UL << TSB_TAG_LOCK_BIT)))
continue; continue;
/* We only put base page size PTEs into the TSB, /* We only put base page size PTEs into the TSB,

5
include/asm-sparc64/tsb.h
View file

@ -47,13 +47,14 @@
* possible solution is to use RCU for the freeing of the TSB. * possible solution is to use RCU for the freeing of the TSB.
*/ */
#define TSB_TAG_LOCK (1 << (47 - 32)) #define TSB_TAG_LOCK_BIT 47
#define TSB_TAG_LOCK_HIGH (1 << (TSB_TAG_LOCK_BIT - 32))
#define TSB_MEMBAR membar #StoreStore #define TSB_MEMBAR membar #StoreStore
#define TSB_LOCK_TAG(TSB, REG1, REG2) \ #define TSB_LOCK_TAG(TSB, REG1, REG2) \
99: lduwa [TSB] ASI_N, REG1; \ 99: lduwa [TSB] ASI_N, REG1; \
sethi %hi(TSB_TAG_LOCK), REG2;\ sethi %hi(TSB_TAG_LOCK_HIGH), REG2;\
andcc REG1, REG2, %g0; \ andcc REG1, REG2, %g0; \
bne,pn %icc, 99b; \ bne,pn %icc, 99b; \
nop; \ nop; \