Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0130b2d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

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
parents 80193195 88fc86c2

arch/x86/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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