diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-17 13:42:20 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-17 13:42:20 -0400 |
| commit | c636fdc59e2b83619ec90d21d0cca04068646bf7 (patch) | |
| tree | f544441da431c4201878a408615e02ba8852d495 | |
| parent | f7f883164bd59da33d4450471f359a6c58a7fda9 (diff) | |
| download | longterm-queue-5.2-c636fdc59e2b83619ec90d21d0cca04068646bf7.tar.gz | |
kprobes: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/kprobes-Fix-compiler-warning-for-CONFIG_KPROBES_ON_F.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 5fbbc6c2..b0696ac0 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: Muchun Song <songmuchun@bytedance.com> 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) |