From d243c0626b3cfe0425eb52f4b5d49ec523d15d25 Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Tue, 27 Dec 2011 11:27:08 +0100 Subject: [PATCH] --- yaml --- r: 280616 b: refs/heads/master c: 3931723f36165e137c67b8c62346024a6c4f223d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/smp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c442d45a463b..b4f5995d8771 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14045ebf1e1156d966a796cacad91028e01797e5 +refs/heads/master: 3931723f36165e137c67b8c62346024a6c4f223d diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c index ee327365e436..14d5211a185d 100644 --- a/trunk/arch/s390/kernel/smp.c +++ b/trunk/arch/s390/kernel/smp.c @@ -149,10 +149,10 @@ void smp_switch_to_ipl_cpu(void (*func)(void *), void *data) sp -= sizeof(struct pt_regs); regs = (struct pt_regs *) sp; memcpy(®s->gprs, ¤t_lc->gpregs_save_area, sizeof(regs->gprs)); - regs->psw = lc->psw_save_area; + regs->psw = current_lc->psw_save_area; sp -= STACK_FRAME_OVERHEAD; sf = (struct stack_frame *) sp; - sf->back_chain = regs->gprs[15]; + sf->back_chain = 0; smp_switch_to_cpu(func, data, sp, stap(), __cpu_logical_map[0]); }