From e4332756503d45dfec43cd4f497615f692452a1a Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 20 Sep 2006 15:59:22 +0200 Subject: [PATCH] --- yaml --- r: 34179 b: refs/heads/master c: 9514e2311be97a01e8669c4de78e9fea37489f09 h: refs/heads/master i: 34177: d439de7aa1eb5c2e0a3e3810a5a655b04ce1d740 34175: 2b45b188d68e4f8ab8d5605b9493a83cb2e711e8 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/entry64.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3bfa48265876..f9ffbea4e969 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6981e936aa156c747bb3e6aea414bba673457115 +refs/heads/master: 9514e2311be97a01e8669c4de78e9fea37489f09 diff --git a/trunk/arch/s390/kernel/entry64.S b/trunk/arch/s390/kernel/entry64.S index 8b956d1538f5..29bbfbab7332 100644 --- a/trunk/arch/s390/kernel/entry64.S +++ b/trunk/arch/s390/kernel/entry64.S @@ -827,7 +827,7 @@ restart_go: */ stack_overflow: lg %r15,__LC_PANIC_STACK # change to panic stack - aghi %r1,-SP_SIZE + aghi %r15,-SP_SIZE mvc SP_PSW(16,%r15),0(%r12) # move user PSW to stack stmg %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack la %r1,__LC_SAVE_AREA @@ -835,7 +835,7 @@ stack_overflow: je 0f chi %r12,__LC_PGM_OLD_PSW je 0f - la %r1,__LC_SAVE_AREA+16 + la %r1,__LC_SAVE_AREA+32 0: mvc SP_R12(32,%r15),0(%r1) # move %r12-%r15 to stack xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) # clear back chain la %r2,SP_PTREGS(%r15) # load pt_regs