diff options
| author | Helge Deller <deller@gmx.de> | 2023-11-20 23:10:20 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2023-11-25 09:43:17 +0100 |
| commit | 33f806da2df68606f77d7b892cd1298ba3d463e8 (patch) | |
| tree | da2c925ee4c048bc896283928399d3a242c97560 | |
| parent | a80aeb86542a50aa8521729ea4cc731ee7174f03 (diff) | |
| download | lwn-33f806da2df68606f77d7b892cd1298ba3d463e8.tar.gz lwn-33f806da2df68606f77d7b892cd1298ba3d463e8.zip | |
parisc: Mark altinstructions read-only and 32-bit aligned
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v6.0+
| -rw-r--r-- | arch/parisc/include/asm/alternative.h | 9 |
1 files 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 - .) ! \ |