Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757875AbZCRMt6 (ORCPT ); Wed, 18 Mar 2009 08:49:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756709AbZCRMs4 (ORCPT ); Wed, 18 Mar 2009 08:48:56 -0400 Received: from mtagate8.de.ibm.com ([195.212.29.157]:45980 "EHLO mtagate8.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755383AbZCRMsx (ORCPT ); Wed, 18 Mar 2009 08:48:53 -0400 Message-Id: <20090318124845.518502853@de.ibm.com> References: <20090318124829.637003183@de.ibm.com> User-Agent: quilt/0.46-1 Date: Wed, 18 Mar 2009 13:48:32 +0100 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens , Martin Schwidefsky Subject: [patch 3/6] ftrace/mcount: fix kernel stack backchain Content-Disposition: inline; filename=003-ftrace-mcount.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1392 Lines: 55 From: Heiko Carstens With packed stack the backchain is at a different location. Just use __SF_BACKCHAIN as an offset to store the backchain. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- arch/s390/kernel/mcount.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: quilt-2.6/arch/s390/kernel/mcount.S =================================================================== --- quilt-2.6.orig/arch/s390/kernel/mcount.S +++ quilt-2.6/arch/s390/kernel/mcount.S @@ -5,6 +5,8 @@ * */ +#include + #ifndef CONFIG_64BIT .globl _mcount _mcount: @@ -14,7 +16,7 @@ _mcount: ahi %r15,-96 l %r3,100(%r15) la %r2,0(%r14) - st %r1,0(%r15) + st %r1,__SF_BACKCHAIN(%r15) la %r3,0(%r3) bras %r14,0f .long ftrace_trace_function @@ -38,7 +40,7 @@ _mcount: stg %r14,112(%r15) lgr %r1,%r15 aghi %r15,-160 - stg %r1,0(%r15) + stg %r1,__SF_BACKCHAIN(%r15) lgr %r2,%r14 lg %r3,168(%r15) larl %r14,ftrace_trace_function -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/