projects/linux·commit 2cb4a182

s390: fix machine check handling

2cb4a182 · Sebastian Ott <[email protected]> · 2014-11-28 15:40:57 +01:00

Commit eb7e7d76 "s390: Replace __get_cpu_var uses" broke machine check
handling.

We copy machine check information from per-cpu to a stack variable for
local processing. Next we should zap the per-cpu variable, not the
stack variable.

Signed-off-by: Sebastian Ott <[email protected]>
Reviewed-by: Heiko Carstens <[email protected]>
Acked-by: Christoph Lameter <[email protected]>
Signed-off-by: Martin Schwidefsky <[email protected]>
Commit
2cb4a18262fd0108cb8abd875710c59d0aa66f1d
Parents
009d0431

Changes

1 files changed · +2 −6

FileStatusAddDelContent
arch/s390/kernel/nmi.cmodified+2−6View file

arch/s390/kernel/nmi.c

View file
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index dd1c24c..3f51cf4 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -54,12 +54,8 @@ void s390_handle_mcck(void)
*/
local_irq_save(flags);
local_mcck_disable();
- /*
- * Ummm... Does this make sense at all? Copying the percpu struct
- * and then zapping it one statement later?
- */
- memcpy(&mcck, this_cpu_ptr(&cpu_mcck), sizeof(mcck));
- memset(&mcck, 0, sizeof(struct mcck_struct));
+ mcck = *this_cpu_ptr(&cpu_mcck);
+ memset(this_cpu_ptr(&cpu_mcck), 0, sizeof(mcck));
clear_cpu_flag(CIF_MCCK_PENDING);
local_mcck_enable();
local_irq_restore(flags);