diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-20 11:29:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-20 11:29:01 -0700 |
| commit | cc1807b9158a909ffe829a5e222be756c57c9a90 (patch) | |
| tree | 90e3c01cf276e81bed0d69d71135ebb216936b93 /arch | |
| parent | 32dd68f11058652a37152aed12bf552455914b40 (diff) | |
| parent | 0fef40be5d1f8e7af3d61e8827a63c5862cd99f7 (diff) | |
| download | linux-stable-cc1807b9158a909ffe829a5e222be756c57c9a90.tar.gz linux-stable-cc1807b9158a909ffe829a5e222be756c57c9a90.tar.bz2 linux-stable-cc1807b9158a909ffe829a5e222be756c57c9a90.zip | |
Merge tag 's390-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Alexander Gordeev:
- Fix a KVM crash on z12 and older machines caused by a wrong
assumption that Query AP Configuration Information is always
available.
- Lower severity of excessive Hypervisor filesystem error messages
when booting under KVM.
* tag 's390-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ap: fix crash on older machines based on QCI info missing
s390/hypfs: avoid error message under KVM
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/hypfs/hypfs_diag.c | 2 | ||||
| -rw-r--r-- | arch/s390/hypfs/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c index f0bc4dc3e9bf..6511d15ace45 100644 --- a/arch/s390/hypfs/hypfs_diag.c +++ b/arch/s390/hypfs/hypfs_diag.c @@ -437,7 +437,7 @@ __init int hypfs_diag_init(void) int rc; if (diag204_probe()) { - pr_err("The hardware system does not support hypfs\n"); + pr_info("The hardware system does not support hypfs\n"); return -ENODATA; } diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 5c97f48cea91..ee919bfc8186 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -496,9 +496,9 @@ fail_hypfs_sprp_exit: hypfs_vm_exit(); fail_hypfs_diag_exit: hypfs_diag_exit(); + pr_err("Initialization of hypfs failed with rc=%i\n", rc); fail_dbfs_exit: hypfs_dbfs_exit(); - pr_err("Initialization of hypfs failed with rc=%i\n", rc); return rc; } device_initcall(hypfs_init) |