提交 d0131b2f 编写于 作者: J Juergen Gross 提交者: openeuler-sync-bot

s390/hypfs: avoid error message under KVM

stable inclusion
from stable-v5.10.141
commit f2b7b8b1c4139d0c3de9e90a30a9259eee8a8f34
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I685FC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f2b7b8b1c4139d0c3de9e90a30a9259eee8a8f34

--------------------------------

[ Upstream commit 7b6670b0 ]

When booting under KVM the following error messages are issued:

hypfs.7f5705: The hardware system does not support hypfs
hypfs.7a79f0: Initialization of hypfs failed with rc=-61

Demote the severity of first message from "error" to "info" and issue
the second message only in other error cases.
Signed-off-by: NJuergen Gross <jgross@suse.com>
Acked-by: NHeiko Carstens <hca@linux.ibm.com>
Acked-by: NChristian Borntraeger <borntraeger@linux.ibm.com>
Link: https://lore.kernel.org/r/20220620094534.18967-1-jgross@suse.com
[arch/s390/hypfs/hypfs_diag.c changed description]
Signed-off-by: NAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: NZheng Zengkai <zhengzengkai@huawei.com>
(cherry picked from commit e5160b5e)
上级 2b20b58b
...@@ -437,7 +437,7 @@ __init int hypfs_diag_init(void) ...@@ -437,7 +437,7 @@ __init int hypfs_diag_init(void)
int rc; int rc;
if (diag204_probe()) { 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; return -ENODATA;
} }
......
...@@ -496,9 +496,9 @@ static int __init hypfs_init(void) ...@@ -496,9 +496,9 @@ static int __init hypfs_init(void)
hypfs_vm_exit(); hypfs_vm_exit();
fail_hypfs_diag_exit: fail_hypfs_diag_exit:
hypfs_diag_exit(); hypfs_diag_exit();
pr_err("Initialization of hypfs failed with rc=%i\n", rc);
fail_dbfs_exit: fail_dbfs_exit:
hypfs_dbfs_exit(); hypfs_dbfs_exit();
pr_err("Initialization of hypfs failed with rc=%i\n", rc);
return rc; return rc;
} }
device_initcall(hypfs_init) device_initcall(hypfs_init)
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册