Commit af2e1938 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/m68k/fpsp040/skeleton.S

+2 −2
Original line number Diff line number Diff line
@@ -499,13 +499,13 @@ in_ea: 
	dbf	%d0,morein

	rts



	.section .fixup,#alloc,#execinstr

	.section .fixup,"ax"

	.even

1:

	jbsr	fpsp040_die

	jbra	.Lnotkern



	.section __ex_table,#alloc

	.section __ex_table,"a"

	.align	4



	.long	in_ea,1b

arch/m68k/ifpsp060/os.S

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/m68k/kernel/relocate_kernel.S

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) 
	lea %pc@(.Lcopy),%a4

2:	addl #0x00000000,%a4		/* virt_to_phys() */



	.section ".m68k_fixup","aw"

	.section .m68k_fixup,"aw"

	.long M68K_FIXUP_MEMOFFSET, 2b+2

	.previous
@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) 
	lea %pc@(.Lcont040),%a4

5:	addl #0x00000000,%a4		/* virt_to_phys() */



	.section ".m68k_fixup","aw"

	.section .m68k_fixup,"aw"

	.long M68K_FIXUP_MEMOFFSET, 5b+2

	.previous