tracing fixes
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
Ingo
------------------>
GeunSik Lim (1):
tracing: Append prompt in /debug/tracing/README file
Steven Rostedt (1):
x86/function-graph: fix constraint for recording old return value
arch/x86/kernel/ftrace.c | 2 +- kernel/trace/trace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/ftrace.c +1 -1
@@ -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" );
kernel/trace/trace.c +1 -1
@@ -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