diff options
| author | Linus Torvalds <[email protected]> | 2020-11-17 11:22:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-11-17 11:22:03 -0800 |
| commit | 111e91a6df505e532a3809ead372787a01e23e0c (patch) | |
| tree | d3ea7beacfa988dd3b25522257d7dfe87dd051bf /arch/s390/kernel/perf_cpum_sf.c | |
| parent | ed129cd75ac1073f32d04d0f2012ede40e86fb77 (diff) | |
| parent | 78d732e1f326f74f240d416af9484928303d9951 (diff) | |
Merge tag 's390-5.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
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
Diffstat (limited to 'arch/s390/kernel/perf_cpum_sf.c')
| -rw-r--r-- | arch/s390/kernel/perf_cpum_sf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c index 00255ae3979d..19cd7b961c45 100644 --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -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); |