diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-24 08:58:01 +1300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-24 08:58:01 +1300 |
| commit | 09c2fe608a2608f9c7de7928f96f0ebc6197e195 (patch) | |
| tree | 88ec60671ee0f4aef9c77f28b9f205ed4e023b12 /drivers/s390 | |
| parent | 333478a7eb21245880c89aad166ad08478cc577d (diff) | |
| parent | 60f1bf29c0b2519989927cae640cd1f50f59dc7f (diff) | |
Merge tag 's390-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
- Do not claim to run under z/VM if the hypervisor can not be
identified
- Fix crashes due to outdated ASCEs in CR1
- Avoid a deadlock in regard to CPU hotplug
- Really fix the vdso mapping issue for compat tasks
- Avoid crash on restart due to an incorrect stack address
* tag 's390-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
s390/vdso: correct vdso mapping for compat tasks
s390/smp: fix CPU hotplug deadlock with CPU rescan
s390/mm: always force a load of the primary ASCE on context switch
s390/early: improve machine detection
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/sclp_config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c index 194ffd5c8580..039b2074db7e 100644 --- a/drivers/s390/char/sclp_config.c +++ b/drivers/s390/char/sclp_config.c @@ -60,7 +60,9 @@ static void sclp_cpu_capability_notify(struct work_struct *work) static void __ref sclp_cpu_change_notify(struct work_struct *work) { + lock_device_hotplug(); smp_rescan_cpus(); + unlock_device_hotplug(); } static void sclp_conf_receiver_fn(struct evbuf_header *evbuf) |