s390 last minute patch for 3.18
Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
A single but important fix for the machine check handling. The big per-cpu cleanup from Christoph causes the code to do nothing after receiving a machine check condition.
Sebastian Ott (1):
s390: fix machine check handling
arch/s390/kernel/nmi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/s390/kernel/nmi.c +2 -6
@@ -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);