s390 updates for 5.10-rc5
Heiko Carstens
maintainerHi Linus,
please pull some small s390 updates for 5.10-rc5.
Thanks,
Heiko
The following changes since commit f8394f232b1eab649ce2df5c5f15b0e528c92091:
Linux 5.10-rc3 (2020-11-08 16:10:16 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.10-4
for you to fetch changes up to 78d732e1f326f74f240d416af9484928303d9951:
s390/cpum_sf.c: fix file permission for cpum_sfb_size (2020-11-12 12:10:36 +0100)
----------------------------------------------------------------
- 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
----------------------------------------------------------------
Heiko Carstens (2):
s390: fix system call exit path
s390: update defconfigs
Thomas Richter (1):
s390/cpum_sf.c: fix file permission for cpum_sfb_size
arch/s390/configs/debug_defconfig | 1 + arch/s390/kernel/entry.S | 2 ++ arch/s390/kernel/perf_cpum_sf.c | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-)
arch/s390/configs/debug_defconfig +1 -0
@@ -1,3 +1,4 @@ +CONFIG_UAPI_HEADER_TEST=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_WATCH_QUEUE=y
arch/s390/kernel/entry.S +2 -0
@@ -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
@@ -2228,4 +2228,4 @@ static int __init init_cpum_sampling_pmu(void) }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 );
The pull request you sent on Tue, 17 Nov 2020 19:21:58 +0100:
The pull request you sent on Tue, 17 Nov 2020 19:21:58 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.10-4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/111e91a6df505e532a3809ead372787a01e23e0c
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html