Skip to contentSkip to conversation

ARCv2: fix local_save_flags

PATCH New Vineet Gupta 1 participant 1 message Sep 30, 2016 Synopsys ARC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARCv2: fix local_save_flags

Commit d9676fa152c83b ("ARCv2: Enable LOCKDEP"), changed local_save_flags() to not return raw STATUS32 but encoded in the form such that it could be fed directly to CLRI/SETI instructions. However the STATUS32.E[] was not captured correctly as it corresponds to bits [4:1] in the register and not [3:0]

Fixes d9676fa152c83b ("ARCv2: Enable LOCKDEP")
Cc Evgeny Voevodin <evgeny.voevodin at intel.com>
Signed-off-by Vineet Gupta <vgupta at synopsys.com>
---
 arch/arc/include/asm/irqflags-arcv2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/include/asm/irqflags-arcv2.h +1 -1
index d1ec7f6b31e0..e880dfa3fcd3 100644
@@ -112,7 +112,7 @@ static inline long arch_local_save_flags(void)
 	 */
 	temp = (1 << 5) |
 		((!!(temp & STATUS_IE_MASK)) << CLRI_STATUS_IE_BIT) |
-		(temp & CLRI_STATUS_E_MASK);
+		((temp >> 1) & CLRI_STATUS_E_MASK);
 	return temp;
 }
 
Signature · 1 line
2.7.4