This is a note to let you know that I've just added the patch titled
parisc: Mark altinstructions read-only and 32-bit aligned
to the 6.1-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:
parisc-mark-altinstructions-read-only-and-32-bit-aligned.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 33f806da2df68606f77d7b892cd1298ba3d463e8 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@xxxxxx>
Date: Mon, 20 Nov 2023 23:10:20 +0100
Subject: parisc: Mark altinstructions read-only and 32-bit aligned
From: Helge Deller <deller@xxxxxx>
commit 33f806da2df68606f77d7b892cd1298ba3d463e8 upstream.
Signed-off-by: Helge Deller <deller@xxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # v6.0+
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/parisc/include/asm/alternative.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/parisc/include/asm/alternative.h b/arch/parisc/include/asm/alternative.h
index 1ed45fd085d3..1eb488f25b83 100644
--- a/arch/parisc/include/asm/alternative.h
+++ b/arch/parisc/include/asm/alternative.h
@@ -34,7 +34,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
/* Alternative SMP implementation. */
#define ALTERNATIVE(cond, replacement) "!0:" \
- ".section .altinstructions, \"aw\" !" \
+ ".section .altinstructions, \"a\" !" \
+ ".align 4 !" \
".word (0b-4-.) !" \
".hword 1, " __stringify(cond) " !" \
".word " __stringify(replacement) " !" \
@@ -44,7 +45,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
/* to replace one single instructions by a new instruction */
#define ALTERNATIVE(from, to, cond, replacement)\
- .section .altinstructions, "aw" ! \
+ .section .altinstructions, "a" ! \
+ .align 4 ! \
.word (from - .) ! \
.hword (to - from)/4, cond ! \
.word replacement ! \
@@ -52,7 +54,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
/* to replace multiple instructions by new code */
#define ALTERNATIVE_CODE(from, num_instructions, cond, new_instr_ptr)\
- .section .altinstructions, "aw" ! \
+ .section .altinstructions, "a" ! \
+ .align 4 ! \
.word (from - .) ! \
.hword -num_instructions, cond ! \
.word (new_instr_ptr - .) ! \
--
2.43.0
Patches currently in stable-queue which might be from deller@xxxxxx are
queue-6.1/parisc-ensure-32-bit-alignment-on-parisc-unwind-section.patch
queue-6.1/parisc-mark-jump_table-naturally-aligned.patch
queue-6.1/parisc-mark-ex_table-entries-32-bit-aligned-in-uaccess.h.patch
queue-6.1/parisc-mark-altinstructions-read-only-and-32-bit-aligned.patch
queue-6.1/parisc-mark-ex_table-entries-32-bit-aligned-in-assembly.h.patch
queue-6.1/parisc-drop-the-hp-ux-enosym-and-eremoterelease-error-codes.patch
queue-6.1/parisc-mark-lock_aligned-variables-16-byte-aligned-on-smp.patch
queue-6.1/parisc-use-natural-cpu-alignment-for-bug_table.patch
