From 2e7bcd016aa2e16a4d26bed374a6201f88382a28 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 15 Sep 2009 08:30:14 -0700 Subject: [PATCH] --- yaml --- r: 167625 b: refs/heads/master c: be10ab109099f8bd8dd365677a9fe641584c1b5b h: refs/heads/master i: 167623: e40535c7b3759b7038a919b5c49288053ae27520 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9ac660af04f..bde7056a3930 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9135c3cc5acf344eb28735681d8bebdb98a2c216 +refs/heads/master: be10ab109099f8bd8dd365677a9fe641584c1b5b diff --git a/trunk/arch/powerpc/kernel/entry_64.S b/trunk/arch/powerpc/kernel/entry_64.S index 900e0eea0099..f9fd54bfcc84 100644 --- a/trunk/arch/powerpc/kernel/entry_64.S +++ b/trunk/arch/powerpc/kernel/entry_64.S @@ -1038,8 +1038,7 @@ _GLOBAL(mod_return_to_handler) * We are in a module using the module's TOC. * Switch to our TOC to run inside the core kernel. */ - LOAD_REG_IMMEDIATE(r4,ftrace_return_to_handler) - ld r2, 8(r4) + ld r2, PACATOC(r13) bl .ftrace_return_to_handler nop