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

Merge tag 'm68k-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - Add seccomp support

 - defconfig updates

 - Miscellaneous fixes and improvements

* tag 'm68k-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: /proc/hardware should depend on PROC_FS
  selftests/seccomp: Add m68k support
  m68k: Add kernel seccomp support
  m68k: Check syscall_trace_enter() return code
  m68k: defconfig: Update defconfigs for v6.2-rc3
  m68k: q40: Do not initialise statics to 0
parents bcf5470e 1e5b5df6

Documentation/features/seccomp/seccomp-filter/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    |     hexagon: | TODO |

    |        ia64: | TODO |

    |   loongarch: |  ok  |

    |        m68k: | TODO |

    |        m68k: |  ok  |

    |  microblaze: | TODO |

    |        mips: |  ok  |

    |       nios2: | TODO |

arch/m68k/68000/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ do_trace: 
	jbsr	syscall_trace_enter

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	addql	#1,%d0

	jeq	ret_from_exception

	movel	%sp@(PT_OFF_ORIG_D0),%d1

	movel	#-ENOSYS,%d0

	cmpl	#NR_syscalls,%d1

arch/m68k/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ config M68K 
	select GENERIC_CPU_DEVICES

	select GENERIC_IOMAP

	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_SECCOMP

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ASM_MODVERSIONS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED

arch/m68k/Kconfig.devices

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config HEARTBEAT 
# We have a dedicated heartbeat LED. :-)

config PROC_HARDWARE

	bool "/proc/hardware support"

	depends on PROC_FS

	help

	  Say Y here to support the /proc/hardware file, which gives you

	  access to information about the machine you're running on,

arch/m68k/coldfire/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ ENTRY(system_call) 
	jbsr	syscall_trace_enter

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	addql	#1,%d0

	jeq	ret_from_exception

	movel	%d3,%a0

	jbsr	%a0@

	movel	%d0,%sp@(PT_OFF_D0)		/* save the return value */