Commit af2e1938 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 0b5547c5 922a9bd1
...@@ -499,13 +499,13 @@ in_ea: ...@@ -499,13 +499,13 @@ in_ea:
dbf %d0,morein dbf %d0,morein
rts rts
.section .fixup,#alloc,#execinstr .section .fixup,"ax"
.even .even
1: 1:
jbsr fpsp040_die jbsr fpsp040_die
jbra .Lnotkern jbra .Lnotkern
.section __ex_table,#alloc .section __ex_table,"a"
.align 4 .align 4
.long in_ea,1b .long in_ea,1b
......
...@@ -379,11 +379,11 @@ _060_real_access: ...@@ -379,11 +379,11 @@ _060_real_access:
| Execption handling for movs access to illegal memory | Execption handling for movs access to illegal memory
.section .fixup,#alloc,#execinstr .section .fixup,"ax"
.even .even
1: moveq #-1,%d1 1: moveq #-1,%d1
rts rts
.section __ex_table,#alloc .section __ex_table,"a"
.align 4 .align 4
.long dmrbuae,1b .long dmrbuae,1b
.long dmrwuae,1b .long dmrwuae,1b
......
...@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) ...@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel)
lea %pc@(.Lcopy),%a4 lea %pc@(.Lcopy),%a4
2: addl #0x00000000,%a4 /* virt_to_phys() */ 2: addl #0x00000000,%a4 /* virt_to_phys() */
.section ".m68k_fixup","aw" .section .m68k_fixup,"aw"
.long M68K_FIXUP_MEMOFFSET, 2b+2 .long M68K_FIXUP_MEMOFFSET, 2b+2
.previous .previous
...@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) ...@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel)
lea %pc@(.Lcont040),%a4 lea %pc@(.Lcont040),%a4
5: addl #0x00000000,%a4 /* virt_to_phys() */ 5: addl #0x00000000,%a4 /* virt_to_phys() */
.section ".m68k_fixup","aw" .section .m68k_fixup,"aw"
.long M68K_FIXUP_MEMOFFSET, 5b+2 .long M68K_FIXUP_MEMOFFSET, 5b+2
.previous .previous
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment