The patch titled
lock validator: s390 use raw_spinlock in mcck handler
has been added to the -mm tree. Its filename is
lock-validator-s390-use-raw_spinlock-in-mcck-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: lock validator: s390 use raw_spinlock in mcck handler
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Machine checks on s390 are always enabled (except in the machine check handler
itself). Therefore use a raw_spinlock 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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/s390/s390mach.c~lock-validator-s390-use-raw_spinlock-in-mcck-handler drivers/s390/s390mach.c
--- 25/drivers/s390/s390mach.c~lock-validator-s390-use-raw_spinlock-in-mcck-handler Mon Jun 19 15:06:15 2006
+++ 25-akpm/drivers/s390/s390mach.c Mon Jun 19 15:06:15 2006
@@ -371,7 +371,7 @@ s390_revalidate_registers(struct mci *mc
void
s390_do_machine_check(struct pt_regs *regs)
{
- static DEFINE_SPINLOCK(ipd_lock);
+ static raw_spinlock_t ipd_lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
static unsigned long long last_ipd;
static int ipd_count;
unsigned long long tmp;
@@ -417,7 +417,7 @@ s390_do_machine_check(struct pt_regs *re
* retry this instruction.
*/
- spin_lock(&ipd_lock);
+ __raw_spin_lock(&ipd_lock);
tmp = get_clock();
@@ -431,7 +431,7 @@ s390_do_machine_check(struct pt_regs *re
if (ipd_count == MAX_IPD_COUNT)
s390_handle_damage("too many ipd retries.");
- spin_unlock(&ipd_lock);
+ __raw_spin_unlock(&ipd_lock);
}
else {
/* Processing damage -> stopping machine */
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
git-klibc.patch
s390-move-var-declarations-behind-ifdef.patch
adjust-handle_irr_event-return-type.patch
add-__iowrite64_copy-s390-fix.patch
kthread-convert-s390machc-from-kernel_thread.patch
lock-validator-s390-stacktrace-interface.patch
lock-validator-s390-config_frame_pointer-support.patch
lock-validator-s390-rwsem-semaphore-changes.patch
lock-validator-early_init_irq_lock_type--console_init.patch
lock-validator-s390-irqtrace-support.patch
lock-validator-__local_bh_enable-_local_bh_enable.patch
lock-validator-s390-use-raw_spinlock-in-mcck-handler.patch
lock-validator-add-s390-to-supported-options.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
