From 9db065e5cd746ca0b1f2d39a1403b38768485f9f Mon Sep 17 00:00:00 2001 From: Wu Zhangjin Date: Sun, 18 Jul 2010 03:10:51 +0800 Subject: [PATCH] --- yaml --- r: 204547 b: refs/heads/master c: 65ab2826c4185fc949c3a720186bd09d75ea14a4 h: refs/heads/master i: 204545: 7b7cff1e0128dfc5cba7251d3686fa0e779950e1 204543: edb436f7738aa0e38c5026bcdbf9e389be5284b5 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/mcount.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7fb3212baeee..fbf88be45ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 652b14aa84961fa391184ccbaf559a537d33b28c +refs/heads/master: 65ab2826c4185fc949c3a720186bd09d75ea14a4 diff --git a/trunk/arch/mips/kernel/mcount.S b/trunk/arch/mips/kernel/mcount.S index 6bfcb7a00ec6..4c968e7efb74 100644 --- a/trunk/arch/mips/kernel/mcount.S +++ b/trunk/arch/mips/kernel/mcount.S @@ -165,12 +165,12 @@ NESTED(ftrace_graph_caller, PT_SIZE, ra) /* arg3: Get frame pointer of current stack */ #ifdef CONFIG_FRAME_POINTER - move a2, fp + move a2, fp #else /* ! CONFIG_FRAME_POINTER */ #ifdef CONFIG_64BIT - PTR_LA a2, PT_SIZE(sp) + PTR_LA a2, PT_SIZE(sp) #else - PTR_LA a2, (PT_SIZE+8)(sp) + PTR_LA a2, (PT_SIZE+8)(sp) #endif #endif