From f5e5805b5a2479b0622db7024a12a3f71558af2a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 11 Feb 2009 10:03:11 +0100 Subject: [PATCH] --- yaml --- r: 140717 b: refs/heads/master c: d524e03207591a6de7e6b5069aabc778e3f0f5f8 h: refs/heads/master i: 140715: 4f575f967a7bab715de39c0de5e085c52f3c3860 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/ftrace.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index af5946c5779e..065a0b9b9ec5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae216dd239765afd592f65d94d8430244cf77ed1 +refs/heads/master: d524e03207591a6de7e6b5069aabc778e3f0f5f8 diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c index 18828aee8781..f20f49f7d244 100644 --- a/trunk/arch/x86/kernel/ftrace.c +++ b/trunk/arch/x86/kernel/ftrace.c @@ -471,13 +471,15 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) "1: " _ASM_MOV " (%[parent_old]), %[old]\n" "2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n" " movl $0, %[faulted]\n" + "3:\n" ".section .fixup, \"ax\"\n" - "3: movl $1, %[faulted]\n" + "4: movl $1, %[faulted]\n" + " jmp 3b\n" ".previous\n" - _ASM_EXTABLE(1b, 3b) - _ASM_EXTABLE(2b, 3b) + _ASM_EXTABLE(1b, 4b) + _ASM_EXTABLE(2b, 4b) : [parent_replaced] "=r" (parent), [old] "=r" (old), [faulted] "=r" (faulted)