diff options
author | Mark Brown <broonie@kernel.org> | 2023-07-30 23:35:45 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-07-30 23:35:45 +0100 |
commit | 5d481ddb6a731281238b6a064c719a91f0234b0c (patch) | |
tree | 7ac5df45ffc6ea49d9b46f5d924fdafc652e1e74 /arch/m68k/ifpsp060/os.S | |
parent | ffb57ee9c0e2a9aae89016ee7b793a666c6aa4a5 (diff) | |
parent | 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 (diff) |
regmap: Merge up fixes from Linus' tree
Gets us pine64plus back if nothing else.
Diffstat (limited to 'arch/m68k/ifpsp060/os.S')
-rw-r--r-- | arch/m68k/ifpsp060/os.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S index 7a0d6e428066..89e2ec224ab6 100644 --- a/arch/m68k/ifpsp060/os.S +++ b/arch/m68k/ifpsp060/os.S @@ -379,11 +379,11 @@ _060_real_access: | Execption handling for movs access to illegal memory - .section .fixup,#alloc,#execinstr + .section .fixup,"ax" .even 1: moveq #-1,%d1 rts -.section __ex_table,#alloc +.section __ex_table,"a" .align 4 .long dmrbuae,1b .long dmrwuae,1b |