!14 rasdaemon: backport bugfix patch from community

From: @lvying6
Reviewed-by: @hanxinke
Signed-off-by: @hanxinke
This commit is contained in:
openeuler-ci-bot 2021-04-28 14:31:34 +08:00 committed by Gitee
commit ddea14517d
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 00115dda854f4a50681ccc6c017daa991234411b Mon Sep 17 00:00:00 2001
From: Liguang Zhang <zhangliguang@linux.alibaba.com>
Date: Mon, 10 Aug 2020 11:07:43 +0800
Subject: [PATCH] rasdaemon: Fix error print
Fix error print handle_ras_events.
Signed-off-by: Liguang Zhang <zhangliguang@linux.alibaba.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
ras-events.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ras-events.c b/ras-events.c
index a99fd29..c797b20 100644
--- a/ras-events.c
+++ b/ras-events.c
@@ -874,7 +874,7 @@ int handle_ras_events(int record_events)
num_events++;
} else
log(ALL, LOG_ERR, "Can't get traces from %s:%s\n",
- "ras", "aer_event");
+ "ras", "extlog_mem_event");
#endif
#ifdef HAVE_DEVLINK
--
2.18.4

View File

@ -1,6 +1,6 @@
Name: rasdaemon
Version: 0.6.6
Release: 3
Release: 4
License: GPLv2
Summary: Utility to get Platform Reliability, Availability and Serviceability (RAS) reports via the Kernel tracing events
URL: https://github.com/mchehab/rasdaemon.git
@ -24,6 +24,7 @@ Patch2: bugfix-rasdaemon-wait-for-file-access.patch
Patch3: bugfix-fix-fd-check.patch
Patch4: backport-0001-ras-page-isolation-do_page_offline-always-considers-.patch
Patch5: backport-0002-ras-page-isolation-page-which-is-PAGE_OFFLINE_FAILED.patch
Patch6: backport-rasdaemon-Fix-error-print.patch
%description
The rasdaemon program is a daemon which monitors the platform
@ -70,6 +71,10 @@ rm INSTALL %{buildroot}/usr/include/*.h
/usr/bin/systemctl enable rasdaemon.service >/dev/null 2>&1 || :
%changelog
* Wed Apr 28 2021 Lv Ying <lvying6@huawei.com> - 0.6.6-4
- backport bugfix patches from community:
1. Fix error print handle_ras_events.
* Wed Mar 31 2021 Lv Ying <lvying6@huawei.com> - 0.6.6-3
- backport bugfix patches from community:
1. ras-page-isolation: do_page_offline always considers page offline was successful