The patch titled
lockdep: s390 turn validator off in machine-check handler
has been added to the -mm tree. Its filename is
lockdep-s390-turn-validator-off-in-machine-check-handler.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lockdep: s390 turn validator off in machine-check handler
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Machine checks on s390 are always enabled (except in the machine check handler
itself). Therefore use lockdep_off()/on() in the machine check handler to
avoid deadlocks in the lock validator.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/s390/s390mach.c | 3 +++
1 file changed, 3 insertions(+)
diff -puN drivers/s390/s390mach.c~lockdep-s390-turn-validator-off-in-machine-check-handler drivers/s390/s390mach.c
--- a/drivers/s390/s390mach.c~lockdep-s390-turn-validator-off-in-machine-check-handler
+++ a/drivers/s390/s390mach.c
@@ -379,6 +379,8 @@ s390_do_machine_check(struct pt_regs *re
struct mcck_struct *mcck;
int umode;
+ lockdep_off();
+
mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
mcck = &__get_cpu_var(cpu_mcck);
umode = user_mode(regs);
@@ -483,6 +485,7 @@ s390_do_machine_check(struct pt_regs *re
mcck->warning = 1;
set_thread_flag(TIF_MCCK_PENDING);
}
+ lockdep_on();
}
/*
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
origin.patch
cpu-hotplug-fix-cpu_up_cancel-handling.patch
s390-setupc-cleanup-build-fix.patch
git-klibc.patch
git-s390.patch
zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix.patch
s390-move-var-declarations-behind-ifdef.patch
fix-oddball-boolean-logic-in-s390-netiucv.patch
s390-broken-null-test-in-claw-driver.patch
lockdep-console_init-after-local_irq_enable.patch
lockdep-add-print_ip_sym.patch
lockdep-s390-config_frame_pointer-support.patch
lockdep-stacktrace-subsystem-s390-support.patch
lockdep-irqtrace-subsystem-s390-support.patch
lockdep-s390-turn-validator-off-in-machine-check-handler.patch
lockdep-annotate-qeth-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
