]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 May 2009 16:15:41 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 May 2009 16:15:41 +0000 (09:15 -0700)
* '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

arch/x86/kernel/ftrace.c
kernel/trace/trace.c

index 18dfa30795c9fe79e617457983acb7e1baa5dbd6..b79c5533c421b4aa7e18d753b64dba3c1f055b90 100644 (file)
@@ -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"
        );
index a884c09006c4d2141248ff04848cca86dff56d64..cda81ec58d9fe1e723388826de8966b274b71d0a 100644 (file)
@@ -2380,7 +2380,7 @@ static const char readme_msg[] =
        "# echo print-parent > /debug/tracing/trace_options\n"
        "# echo 1 > /debug/tracing/tracing_enabled\n"
        "# cat /debug/tracing/trace > /tmp/trace.txt\n"
-       "echo 0 > /debug/tracing/tracing_enabled\n"
+       "echo 0 > /debug/tracing/tracing_enabled\n"
 ;
 
 static ssize_t