Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kernel / ftrace.c

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 76228525acd001819a71af803ba567f4f69cfda9..4b73f5937f41dc2f021f29af9eb58ce694fc28cd 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -310,7 +310,6 @@ int ftrace_int3_handler(struct pt_regs *regs)
 
        ip = regs->ip - INT3_INSN_SIZE;
 
-#ifdef CONFIG_X86_64
        if (ftrace_location(ip)) {
                int3_emulate_call(regs, (unsigned long)ftrace_regs_caller);
                return 1;
@@ -322,12 +321,6 @@ int ftrace_int3_handler(struct pt_regs *regs)
                int3_emulate_call(regs, ftrace_update_func_call);
                return 1;
        }
-#else
-       if (ftrace_location(ip) || is_ftrace_caller(ip)) {
-               int3_emulate_jmp(regs, ip + CALL_INSN_SIZE);
-               return 1;
-       }
-#endif
 
        return 0;
 }