The patch titled
lock validator: s390 mcck handler cleanup+fix
has been removed from the -mm tree. Its filename is
lock-validator-s390-mcck-handler-cleanupfix.patch
This patch was dropped because lockdep is being redone
------------------------------------------------------
Subject: lock validator: s390 mcck handler cleanup+fix
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Use lockdep_off/on instead of raw_spinlocks in machine check code. Also
add a missing TRACE_IRQ_OFF/ON pair.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/s390/kernel/entry.S | 2 ++
arch/s390/kernel/entry64.S | 2 ++
drivers/s390/s390mach.c | 9 ++++++---
3 files changed, 10 insertions(+), 3 deletions(-)
diff -puN arch/s390/kernel/entry64.S~lock-validator-s390-mcck-handler-cleanupfix arch/s390/kernel/entry64.S
--- a/arch/s390/kernel/entry64.S~lock-validator-s390-mcck-handler-cleanupfix
+++ a/arch/s390/kernel/entry64.S
@@ -763,7 +763,9 @@ mcck_no_vtime:
stosm __SF_EMPTY(%r15),0x04 # turn dat on
tm __TI_flags+7(%r9),_TIF_MCCK_PENDING
jno mcck_return
+ TRACE_IRQS_OFF
brasl %r14,s390_handle_mcck
+ TRACE_IRQS_ON
mcck_return:
mvc __LC_RETURN_MCCK_PSW(16),SP_PSW(%r15) # move return PSW
ni __LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit
diff -puN arch/s390/kernel/entry.S~lock-validator-s390-mcck-handler-cleanupfix arch/s390/kernel/entry.S
--- a/arch/s390/kernel/entry.S~lock-validator-s390-mcck-handler-cleanupfix
+++ a/arch/s390/kernel/entry.S
@@ -751,8 +751,10 @@ mcck_no_vtime:
stosm __SF_EMPTY(%r15),0x04 # turn dat on
tm __TI_flags+3(%r9),_TIF_MCCK_PENDING
bno BASED(mcck_return)
+ TRACE_IRQS_OFF
l %r1,BASED(.Ls390_handle_mcck)
basr %r14,%r1 # call machine check handler
+ TRACE_IRQS_ON
mcck_return:
mvc __LC_RETURN_MCCK_PSW(8),SP_PSW(%r15) # move return PSW
ni __LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit
diff -puN drivers/s390/s390mach.c~lock-validator-s390-mcck-handler-cleanupfix drivers/s390/s390mach.c
--- a/drivers/s390/s390mach.c~lock-validator-s390-mcck-handler-cleanupfix
+++ a/drivers/s390/s390mach.c
@@ -371,7 +371,7 @@ s390_revalidate_registers(struct mci *mc
void
s390_do_machine_check(struct pt_regs *regs)
{
- static raw_spinlock_t ipd_lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+ static DEFINE_SPINLOCK(ipd_lock);
static unsigned long long last_ipd;
static int ipd_count;
unsigned long long tmp;
@@ -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);
@@ -417,7 +419,7 @@ s390_do_machine_check(struct pt_regs *re
* retry this instruction.
*/
- __raw_spin_lock(&ipd_lock);
+ spin_lock(&ipd_lock);
tmp = get_clock();
@@ -431,7 +433,7 @@ s390_do_machine_check(struct pt_regs *re
if (ipd_count == MAX_IPD_COUNT)
s390_handle_damage("too many ipd retries.");
- __raw_spin_unlock(&ipd_lock);
+ spin_unlock(&ipd_lock);
}
else {
/* Processing damage -> stopping machine */
@@ -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
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
cpu-hotplug-fix-cpu_up_cancel-handling.patch
s390-setupc-cleanup-build-fix.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
