diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
| commit | a057efde80453c68c60e156803578a654b52c39f (patch) | |
| tree | 51c312e95de536b6a29d18a12cfdba72029e09ad /arch/m68k/ifpsp060/os.S | |
| parent | ALSA: hda/tas2781: Fix PM refcount unbalance at tas2781_hda_bind() (diff) | |
| parent | Merge tag 'asoc-fix-v6.5-rc7' of https://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-a057efde80453c68c60e156803578a654b52c39f.tar.xz linux-a057efde80453c68c60e156803578a654b52c39f.zip | |
Merge branch 'for-linus' into for-next
Back-merge the 6.5-devel branch for the clean patch application for
6.6 and resolving merge conflicts.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 |