From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 7 Nov 2020 12:18:49 +0000 (+0100)
Subject: Merge branch 'linus' into perf/kprobes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0a986ea81e1aa8ac17e82cda53cc95158217956e;p=linux.git

Merge branch 'linus' into perf/kprobes

Merge recent kprobes updates into perf/kprobes that came from -mm.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

0a986ea81e1aa8ac17e82cda53cc95158217956e
diff --cc include/linux/kprobes.h
index b7824e3f1ef5a,8aab327b5539d..a794044338123
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@@ -398,7 -371,10 +398,9 @@@ int register_kretprobes(struct kretprob
  void unregister_kretprobes(struct kretprobe **rps, int num);
  
  void kprobe_flush_task(struct task_struct *tk);
 -void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
  
+ void kprobe_free_init_mem(void);
+ 
  int disable_kprobe(struct kprobe *kp);
  int enable_kprobe(struct kprobe *kp);