Skip to contentSkip to conversation

Patch "ARCv2: fix local_save_flags" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 20, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARCv2: fix local_save_flags

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arcv2-fix-local_save_flags.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From cd5d38b052384daa2893e9a1d94900d5a20ed4b5 Mon Sep 17 00:00:00 2001

From: Vineet Gupta <[email protected]>
Date: Fri, 30 Sep 2016 13:27:25 -0700
Subject: ARCv2: fix local_save_flags

From: Vineet Gupta <[email protected]>

commit cd5d38b052384daa2893e9a1d94900d5a20ed4b5 upstream.

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 <[email protected]>
---
 arch/arc/include/asm/irqflags-arcv2.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/include/asm/irqflags-arcv2.h +1 -1
@@ -112,7 +112,7 @@ static inline long arch_local_save_flags
 	 */
 	temp = (1 << 5) |
 		((!!(temp & STATUS_IE_MASK)) << CLRI_STATUS_IE_BIT) |
-		(temp & CLRI_STATUS_E_MASK);
+		((temp >> 1) & CLRI_STATUS_E_MASK);
 	return temp;
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/arcv2-intc-use-kflag-if-status32.ie-must-be-reset.patch queue-4.8/arcv2-fix-local_save_flags.patch