diff for duplicates of <162756756529.301564.4355800871953996544.stgit@devnote2>
diff --git a/a/1.txt b/N1/1.txt
index e70a31d..6ad44f9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -49,15 +49,14 @@ index 441ed04b1037..d4048518a1d7 100644
@@ -902,14 +903,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_descriptor(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 c2e6b1a..04dacce 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH -tip v10 01/16] ia64: kprobes: Fix to pass correct trampoline address to the handler\0"
]
[
- "Date\0Thu, 29 Jul 2021 23:06:05 +0900\0"
+ "Date\0Thu, 29 Jul 2021 14:06:05 +0000\0"
]
[
"To\0Steven Rostedt <rostedt\@goodmis.org>",
@@ -91,15 +91,14 @@
"\@\@ -902,14 +903,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_descriptor(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",
@@ -107,4 +106,4 @@
" \treturn 0;"
]
-a69a76aa24bc1b41037f92bbfb1028ed4c83e6ebe4999b3a11a548cd1125824b
+29cb34df412252c306d4ef904cf684e039acd830cc529f8257e559cd71d3dfdd
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.