kprobes: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch b/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch
index 5fbbc6c..b0696ac 100644
--- a/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch
+++ b/queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch
@@ -1,4 +1,4 @@
-From 10de795a5addd1962406796a6e13ba6cc0fc6bee Mon Sep 17 00:00:00 2001
+From 5a928eb44658cc44a2f934a999f26d35f9354e72 Mon Sep 17 00:00:00 2001
From: Muchun Song <songmuchun@bytedance.com>
Date: Thu, 6 Aug 2020 01:20:46 +0800
Subject: [PATCH] kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
@@ -27,11 +27,11 @@
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
-index 07bf03fcf574..66d14107968d 100644
+index 24834e22ce1a..a0dfc7d425f0 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
-@@ -1079,9 +1079,20 @@ static int disarm_kprobe_ftrace(struct kprobe *p)
- ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled);
+@@ -1052,9 +1052,20 @@ static int disarm_kprobe_ftrace(struct kprobe *p)
+ return ret;
}
#else /* !CONFIG_KPROBES_ON_FTRACE */
-#define prepare_kprobe(p) arch_prepare_kprobe(p)
