summaryrefslogtreecommitdiff
path: root/drivers/acpi/apei/erst.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-01-12 20:56:54 +0400
committerIngo Molnar <mingo@kernel.org>2014-01-12 20:56:54 +0400
commitb769e014f3ae4af8a56c6327077b3c40410dedad (patch)
treebeeaa315d7287b96f2813d8d060c43f2658a07b8 /drivers/acpi/apei/erst.c
parentda4540757d35a98a350d6e8d882a64b2d04f8581 (diff)
parent4f75d8412792777a314ac5c1393a9ed43d695fd1 (diff)
downloadlinux-b769e014f3ae4af8a56c6327077b3c40410dedad.tar.xz
Merge tag 'ras_for_3.14_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull RAS updates from Borislav Petkov: " SCI reporting for other error types not only correctable ones + APEI GHES cleanups + mce timer fix " Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/apei/erst.c')
-rw-r--r--drivers/acpi/apei/erst.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index cb1d557fc22c..ed65e9c4b5b0 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -611,7 +611,7 @@ static void __erst_record_id_cache_compact(void)
if (entries[i] == APEI_ERST_INVALID_RECORD_ID)
continue;
if (wpos != i)
- memcpy(&entries[wpos], &entries[i], sizeof(entries[i]));
+ entries[wpos] = entries[i];
wpos++;
}
erst_record_id_cache.len = wpos;