Merge tag 's390-5.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (111e91a6) · Commits · 戴 / test

Pull s390 fixes from Heiko Carstens: - fix system call exit path; avoid return to user space with any TIF/CIF/PIF set - fix file permission for cpum_sfb_size parameter - another small defconfig update * tag 's390-5.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/cpum_sf.c: fix file permission for cpum_sfb_size s390: update defconfigs s390: fix system call exit path

arch/s390/configs/debug_defconfig

+1 −0

Original line number	Diff line number	Diff line
		CONFIG_UAPI_HEADER_TEST=y
		CONFIG_SYSVIPC=y
		CONFIG_POSIX_MQUEUE=y
		CONFIG_WATCH_QUEUE=y

arch/s390/kernel/entry.S

+2 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,7 @@ ENTRY(system_call)
		#endif
		LOCKDEP_SYS_EXIT
		.Lsysc_tif:
		DISABLE_INTS
		TSTMSK __PT_FLAGS(%r11),_PIF_WORK
		jnz .Lsysc_work
		TSTMSK __TI_flags(%r12),_TIF_WORK
		@@ -444,6 +445,7 @@ ENTRY(system_call)
		# One of the work bits is on. Find out which one.
		#
		.Lsysc_work:
		ENABLE_INTS
		TSTMSK __TI_flags(%r12),_TIF_NEED_RESCHED
		jo .Lsysc_reschedule
		TSTMSK __PT_FLAGS(%r11),_PIF_SYSCALL_RESTART

arch/s390/kernel/perf_cpum_sf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2228,4 +2228,4 @@ out:
		}

		arch_initcall(init_cpum_sampling_pmu);
		core_param(cpum_sfb_size, CPUM_SF_MAX_SDB, sfb_size, 0640);
		core_param(cpum_sfb_size, CPUM_SF_MAX_SDB, sfb_size, 0644);

Admin message