parisc: Mark altinstructions read-only and 32-bit aligned

commit 33f806da2df68606f77d7b892cd1298ba3d463e8 upstream.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org   # v6.0+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/parisc/include/asm/alternative.h b/arch/parisc/include/asm/alternative.h
index 1ed45fd..1eb488f 100644 (file)
--- 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 - .)       !       \