Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into...

[linux-2.6] / arch / arm / kernel / entry-common.S

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 8f79a4789ed48d0a513f16f107eca73726b26e59..060d7e2e9f6408c1aaf647af4eba7b5858a8aa31 100644 (file)
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -9,7 +9,8 @@
  */
 
 #include <asm/unistd.h>
-#include <asm/arch/entry-macro.S>
+#include <asm/ftrace.h>
+#include <mach/entry-macro.S>
 
 #include "entry-header.S"
 
@@ -104,6 +105,7 @@ ENTRY(ret_from_fork)
 ENTRY(mcount)
        stmdb sp!, {r0-r3, lr}
        mov r0, lr
+       sub r0, r0, #MCOUNT_INSN_SIZE
 
        .globl mcount_call
 mcount_call:
@@ -114,6 +116,7 @@ ENTRY(ftrace_caller)
        stmdb sp!, {r0-r3, lr}
        ldr r1, [fp, #-4]
        mov r0, lr
+       sub r0, r0, #MCOUNT_INSN_SIZE
 
        .globl ftrace_call
 ftrace_call:
@@ -134,6 +137,7 @@ ENTRY(mcount)
 trace:
        ldr r1, [fp, #-4]
        mov r0, lr
+       sub r0, r0, #MCOUNT_INSN_SIZE
        mov lr, pc
        mov pc, r2
        ldmia sp!, {r0-r3, pc}