Subject: Patch "arm64: Remove a redundancy in sysreg.h" has been added to the 4.9-stable tree

From: <[email-masked]>
Date: Sun, 09 Jan 2022 14:07:39 +0100

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

    arm64: Remove a redundancy in sysreg.h

to the 4.9-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:
     arm64-remove-a-redundancy-in-sysreg.h.patch
and it can be found in the queue-4.9 subdirectory.

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

>From foo@baz Sun Jan  9 01:56:51 PM CET 2022
From: Nathan Chancellor <[email-masked]>
Date: Fri,  7 Jan 2022 12:43:32 -0700
Subject: arm64: Remove a redundancy in sysreg.h
To: Greg Kroah-Hartman <[email-masked]>, Sasha Levin <[email-masked]>, Catalin Marinas <[email-masked]>, Will Deacon <[email-masked]>
Cc: Mark Rutland <[email-masked]>, Marc Zyngier <[email-masked]>, Nick Desaulniers <[email-masked]>, [email-masked], [email-masked], [email-masked]
Message-ID: <[email-masked]>

From: Stefan Traby <[email-masked]>

commit d38338e396ee0571b3502962fd2fbaec4d2d9a8f upstream.

This is really trivial; there is a dup (1 << 16) in the code

Acked-by: Will Deacon <[email-masked]>
Signed-off-by: Stefan Traby <[email-masked]>
Signed-off-by: Marc Zyngier <[email-masked]>
Signed-off-by: Nathan Chancellor <[email-masked]>
Signed-off-by: Greg Kroah-Hartman <[email-masked]>
---
 arch/arm64/include/asm/sysreg.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -95,8 +95,8 @@
 #define SCTLR_ELx_M	1
 
 #define SCTLR_EL2_RES1	((1 << 4)  | (1 << 5)  | (1 << 11) | (1 << 16) | \
-			 (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \
-			 (1 << 28) | (1 << 29))
+			 (1 << 18) | (1 << 22) | (1 << 23) | (1 << 28) | \
+			 (1 << 29))
 
 #define SCTLR_ELx_FLAGS	(SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \
 			 SCTLR_ELx_SA | SCTLR_ELx_I)

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

queue-4.9/arm64-sysreg-move-to-use-definitions-for-all-the-sctlr-bits.patch
queue-4.9/bug-split-build_bug-stuff-out-into-linux-build_bug.h.patch
queue-4.9/arm64-move-vhe-work-to-end-of-el2_setup.patch
queue-4.9/arm64-remove-a-redundancy-in-sysreg.h.patch
queue-4.9/arm64-reduce-el2_setup-branching.patch

_______________________________________________
linux-arm-kernel mailing list
[email-masked]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel