diff for duplicates of <161639519485.895304.12333883738312999681.stgit@devnote2>
diff --git a/a/1.txt b/N1/1.txt
index d3dfb6b..577288e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -37,15 +37,14 @@ index fc1ff8a4d7de..006fbc1d7ae9 100644
@@ -918,14 +919,14 @@ static struct kprobe trampoline_p = {
int __init arch_init_kprobes(void)
{
- trampoline_p.addr =
-- (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;
+ trampoline_p.addr - (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;
+ dereference_function_description(kretprobe_trampoline);
return register_kprobe(&trampoline_p);
}
int __kprobes arch_trampoline_kprobe(struct kprobe *p)
{
- if (p->addr ==
+ if (p->addr =
- (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip)
+ dereference_function_descriptor(kretprobe_trampoline))
return 1;
diff --git a/a/content_digest b/N1/content_digest
index 6a0497b..e577fe1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH -tip v4 01/12] ia64: kprobes: Fix to pass correct trampoline address to the handler\0"
]
[
- "Date\0Mon, 22 Mar 2021 15:39:55 +0900\0"
+ "Date\0Mon, 22 Mar 2021 06:39:55 +0000\0"
]
[
"To\0Steven Rostedt <rostedt\@goodmis.org>",
@@ -76,15 +76,14 @@
"\@\@ -918,14 +919,14 \@\@ static struct kprobe trampoline_p = {\n",
" int __init arch_init_kprobes(void)\n",
" {\n",
- " \ttrampoline_p.addr =\n",
- "-\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;\n",
+ " \ttrampoline_p.addr -\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;\n",
"+\t\tdereference_function_description(kretprobe_trampoline);\n",
" \treturn register_kprobe(&trampoline_p);\n",
" }\n",
" \n",
" int __kprobes arch_trampoline_kprobe(struct kprobe *p)\n",
" {\n",
- " \tif (p->addr ==\n",
+ " \tif (p->addr =\n",
"-\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip)\n",
"+\t\tdereference_function_descriptor(kretprobe_trampoline))\n",
" \t\treturn 1;\n",
@@ -92,4 +91,4 @@
" \treturn 0;"
]
-0c7ecfcb4e95471a40034c3a48eaf2be15147a298d7eabb76216f25ea12edc6a
+0058210c298ef55471f2b318a407951b6a845157e7f7805651141e42f1aad9c8
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.