From 9ba793f3da6838433ae5a13b2c3f6ff3c2493c93 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 18 Mar 2009 13:27:34 +0100 Subject: [PATCH] --- yaml --- r: 132491 b: refs/heads/master c: cf087343805ebfea2b1234b06fd5f12273e865b1 h: refs/heads/master i: 132489: 9b16a757231d3bae69f5aa746da2d5b252fcf53d 132487: abad7d44f05e269b373da2c62d22b451a4206929 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/mcount.S | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9c137eaf7c9..82d507e25cce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f55d63854e426e95d7858c2662c2353262a5af70 +refs/heads/master: cf087343805ebfea2b1234b06fd5f12273e865b1 diff --git a/trunk/arch/s390/kernel/mcount.S b/trunk/arch/s390/kernel/mcount.S index 397d131a345f..80641224a095 100644 --- a/trunk/arch/s390/kernel/mcount.S +++ b/trunk/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