diff for duplicates of <163163036568.489837.14085396178727185469.stgit@devnote2> diff --git a/a/1.txt b/N1/1.txt index 2afe1c7..d3da1ad 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -254,7 +254,7 @@ index 30199bfcc74a..7663c8a51889 100644 return ret; - } - if (*cnt == 0) { + if (*cnt = 0) { ret = register_ftrace_function(ops); - if (ret) { - pr_debug("Failed to init kprobe-ftrace (%d)\n", ret); @@ -266,7 +266,7 @@ index 30199bfcc74a..7663c8a51889 100644 (*cnt)++; @@ -1083,14 +1081,14 @@ static int __disarm_kprobe_ftrace(struct kprobe *p, struct ftrace_ops *ops, - if (*cnt == 1) { + if (*cnt = 1) { ret = unregister_ftrace_function(ops); - if (WARN(ret < 0, "Failed to unregister kprobe-ftrace (%d)\n", ret)) + if (WARN(ret < 0, "Failed to unregister kprobe-ftrace (error %d)\n", ret)) @@ -311,8 +311,7 @@ index 30199bfcc74a..7663c8a51889 100644 if (kretprobe_blacklist_size) { @@ -2483,7 +2479,7 @@ static int __init init_kprobes(void) - kretprobe_blacklist[i].addr = - kprobe_lookup_name(kretprobe_blacklist[i].name, 0); + kretprobe_blacklist[i].addr kprobe_lookup_name(kretprobe_blacklist[i].name, 0); if (!kretprobe_blacklist[i].addr) - printk("kretprobe: lookup failed: %s\n", + pr_err("Failed to lookup symbol '%s' for kretprobe blacklist. Maybe the target function is removed or renamed.\n", diff --git a/a/content_digest b/N1/content_digest index 9281201..b847323 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0163163030719.489837.2236069935502195491.stgit@devnote2\0" "From\0Masami Hiramatsu <mhiramat@kernel.org>\0" "Subject\0[PATCH -tip v11 06/27] kprobes: treewide: Cleanup the error messages for kprobes\0" - "Date\0Tue, 14 Sep 2021 23:39:25 +0900\0" + "Date\0Tue, 14 Sep 2021 14:39:25 +0000\0" "To\0Steven Rostedt <rostedt@goodmis.org>" Josh Poimboeuf <jpoimboe@redhat.com> " Ingo Molnar <mingo@kernel.org>\0" @@ -280,7 +280,7 @@ " \t\treturn ret;\n" "-\t}\n" " \n" - " \tif (*cnt == 0) {\n" + " \tif (*cnt = 0) {\n" " \t\tret = register_ftrace_function(ops);\n" "-\t\tif (ret) {\n" "-\t\t\tpr_debug(\"Failed to init kprobe-ftrace (%d)\\n\", ret);\n" @@ -292,7 +292,7 @@ " \t(*cnt)++;\n" "@@ -1083,14 +1081,14 @@ static int __disarm_kprobe_ftrace(struct kprobe *p, struct ftrace_ops *ops,\n" " \n" - " \tif (*cnt == 1) {\n" + " \tif (*cnt = 1) {\n" " \t\tret = unregister_ftrace_function(ops);\n" "-\t\tif (WARN(ret < 0, \"Failed to unregister kprobe-ftrace (%d)\\n\", ret))\n" "+\t\tif (WARN(ret < 0, \"Failed to unregister kprobe-ftrace (error %d)\\n\", ret))\n" @@ -337,8 +337,7 @@ " \n" " \tif (kretprobe_blacklist_size) {\n" "@@ -2483,7 +2479,7 @@ static int __init init_kprobes(void)\n" - " \t\t\tkretprobe_blacklist[i].addr =\n" - " \t\t\t\tkprobe_lookup_name(kretprobe_blacklist[i].name, 0);\n" + " \t\t\tkretprobe_blacklist[i].addr \t\t\t\tkprobe_lookup_name(kretprobe_blacklist[i].name, 0);\n" " \t\t\tif (!kretprobe_blacklist[i].addr)\n" "-\t\t\t\tprintk(\"kretprobe: lookup failed: %s\\n\",\n" "+\t\t\t\tpr_err(\"Failed to lookup symbol '%s' for kretprobe blacklist. Maybe the target function is removed or renamed.\\n\",\n" @@ -364,4 +363,4 @@ " \telse\n" " \t\tpr_info(\"Kprobes globally disabled\\n\");" -284ab7cf06c9a0f21c8f82ad3d6ec2fdf9b1d3d4737e55566027a7ae44d9bd54 +1c2c7285bdc3684aa7c2051b728aafb34d83162a9036ade6d36d34f32621f994
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.