From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Oct 2020 21:21:15 +0000 (-0700)
Subject: Merge tag 'perf-kprobes-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c6890707eb1438b0fb4e0a10d4afe48a217628b;p=linux.git

Merge tag 'perf-kprobes-2020-10-12' of git://git./linux/kernel/git/tip/tip

Pull perf/kprobes updates from Ingo Molnar:
 "This prepares to unify the kretprobe trampoline handler and make
  kretprobe lockless (those patches are still work in progress)"

* tag 'perf-kprobes-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  kprobes: Fix to check probe enabled before disarm_kprobe_ftrace()
  kprobes: Make local functions static
  kprobes: Free kretprobe_instance with RCU callback
  kprobes: Remove NMI context check
  sparc: kprobes: Use generic kretprobe trampoline handler
  sh: kprobes: Use generic kretprobe trampoline handler
  s390: kprobes: Use generic kretprobe trampoline handler
  powerpc: kprobes: Use generic kretprobe trampoline handler
  parisc: kprobes: Use generic kretprobe trampoline handler
  mips: kprobes: Use generic kretprobe trampoline handler
  ia64: kprobes: Use generic kretprobe trampoline handler
  csky: kprobes: Use generic kretprobe trampoline handler
  arc: kprobes: Use generic kretprobe trampoline handler
  arm64: kprobes: Use generic kretprobe trampoline handler
  arm: kprobes: Use generic kretprobe trampoline handler
  x86/kprobes: Use generic kretprobe trampoline handler
  kprobes: Add generic kretprobe trampoline handler
---

1c6890707eb1438b0fb4e0a10d4afe48a217628b
diff --cc include/linux/kprobes.h
index 8aab327b5539d,5c8c271fa1e94..629abaf25681d
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@@ -371,10 -383,7 +383,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);