From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757233AbcBXO2z (ORCPT ); Wed, 24 Feb 2016 09:28:55 -0500 Received: from ozlabs.org ([103.22.144.67]:32884 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752287AbcBXO2x (ORCPT ); Wed, 24 Feb 2016 09:28:53 -0500 From: Michael Ellerman To: Cc: bsingharora@gmail.com, duwe@lst.de, , rostedt@goodmis.org, kamalesh@linux.vnet.ibm.com, pmladek@suse.com, jeyu@redhat.com, jkosina@suse.cz, live-patching@vger.kernel.org, mbenes@suse.cz Subject: [PATCH 05/12] powerpc/ftrace: ftrace_graph_caller() needs to save/restore toc Date: Thu, 25 Feb 2016 01:28:28 +1100 Message-Id: <1456324115-21144-5-git-send-email-mpe@ellerman.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456324115-21144-1-git-send-email-mpe@ellerman.id.au> References: <1456324115-21144-1-git-send-email-mpe@ellerman.id.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/entry_64.S | 8 ++++++++ 1 file changed, 8 insertions(+) Squash. diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 2a7313cfbc7d..9e77a2c8f218 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -1237,6 +1237,11 @@ _GLOBAL(ftrace_graph_caller) std r5, 64(r1) std r4, 56(r1) std r3, 48(r1) + + /* Save callee's TOC in the ABI compliant location */ + std r2, 24(r1) + ld r2, PACATOC(r13) /* get kernel TOC in r2 */ + mfctr r4 /* ftrace_caller has moved local addr here */ std r4, 40(r1) mflr r3 /* ftrace_caller has restored LR from stack */ @@ -1262,6 +1267,9 @@ _GLOBAL(ftrace_graph_caller) ld r4, 56(r1) ld r3, 48(r1) + /* Restore callee's TOC */ + ld r2, 24(r1) + addi r1, r1, 112 mflr r0 std r0, LRSAVE(r1) -- 2.5.0