Skip to content

Commit af2e193

Browse files
committed
Merge tag 'm68k-for-v6.5-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fix from Geert Uytterhoeven: - Fix the build when using the toolchain in Debian unstable. * tag 'm68k-for-v6.5-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Fix invalid .section syntax
2 parents 0b5547c + 922a9bd commit af2e193

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

arch/m68k/fpsp040/skeleton.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,13 +499,13 @@ in_ea:
499499
dbf %d0,morein
500500
rts
501501

502-
.section .fixup,#alloc,#execinstr
502+
.section .fixup,"ax"
503503
.even
504504
1:
505505
jbsr fpsp040_die
506506
jbra .Lnotkern
507507

508-
.section __ex_table,#alloc
508+
.section __ex_table,"a"
509509
.align 4
510510

511511
.long in_ea,1b

arch/m68k/ifpsp060/os.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,11 @@ _060_real_access:
379379

380380

381381
| Execption handling for movs access to illegal memory
382-
.section .fixup,#alloc,#execinstr
382+
.section .fixup,"ax"
383383
.even
384384
1: moveq #-1,%d1
385385
rts
386-
.section __ex_table,#alloc
386+
.section __ex_table,"a"
387387
.align 4
388388
.long dmrbuae,1b
389389
.long dmrwuae,1b

arch/m68k/kernel/relocate_kernel.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel)
2626
lea %pc@(.Lcopy),%a4
2727
2: addl #0x00000000,%a4 /* virt_to_phys() */
2828

29-
.section ".m68k_fixup","aw"
29+
.section .m68k_fixup,"aw"
3030
.long M68K_FIXUP_MEMOFFSET, 2b+2
3131
.previous
3232

@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel)
4949
lea %pc@(.Lcont040),%a4
5050
5: addl #0x00000000,%a4 /* virt_to_phys() */
5151

52-
.section ".m68k_fixup","aw"
52+
.section .m68k_fixup,"aw"
5353
.long M68K_FIXUP_MEMOFFSET, 5b+2
5454
.previous
5555

0 commit comments

Comments
 (0)