diff for duplicates of <20181204103654.805556008@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index 87cf773..9ec0811 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> } - err = ftrace_push_return_trace(old, self_addr, &trace.depth, 0, NULL); -- if (err = -EBUSY) { +- if (err == -EBUSY) { + if (function_graph_enter(old, self_addr, 0, NULL)) __raw_writel(old, parent); - return; diff --git a/a/content_digest b/N1/content_digest index e396f5c..4a7c73b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181204103649.950154335@linuxfoundation.org\0" "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 4.19 104/139] sh/function_graph: Simplify with function_graph_enter()\0" - "Date\0Tue, 04 Dec 2018 10:49:45 +0000\0" + "Date\0Tue, 4 Dec 2018 11:49:45 +0100\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" stable@vger.kernel.org @@ -61,7 +61,7 @@ " \t}\n" " \n" "-\terr = ftrace_push_return_trace(old, self_addr, &trace.depth, 0, NULL);\n" - "-\tif (err = -EBUSY) {\n" + "-\tif (err == -EBUSY) {\n" "+\tif (function_graph_enter(old, self_addr, 0, NULL))\n" " \t\t__raw_writel(old, parent);\n" "-\t\treturn;\n" @@ -77,4 +77,4 @@ " }\n" #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ -d5a8c0358001c3a75338f7fbeb62e373681d494609b80616a2354f98c9721ec4 +96fe2ef4f24647c769fe39f2f6b2c5deb4985efe495014e3bfab957870c915fa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.