summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-18 09:15:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-18 09:15:41 -0700
commit0130b2d7010fe8e046b7a6c44911a1d3d0d16c96 (patch)
treee4fb22c311a2ca8da64528538646d1e2579f4447 /arch/x86
parent80193195f87ebca6d7417516d6edeb3969631c15 (diff)
parent88fc86c283d9c3854e67e4155808027bc2519eb6 (diff)
downloadop-kernel-dev-0130b2d7010fe8e046b7a6c44911a1d3d0d16c96.zip
op-kernel-dev-0130b2d7010fe8e046b7a6c44911a1d3d0d16c96.tar.gz
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Append prompt in /debug/tracing/README file x86/function-graph: fix constraint for recording old return value
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 18dfa30..b79c553 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -442,7 +442,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
_ASM_EXTABLE(1b, 4b)
_ASM_EXTABLE(2b, 4b)
- : [old] "=r" (old), [faulted] "=r" (faulted)
+ : [old] "=&r" (old), [faulted] "=r" (faulted)
: [parent] "r" (parent), [return_hooker] "r" (return_hooker)
: "memory"
);
OpenPOWER on IntegriCloud