summaryrefslogtreecommitdiff
path: root/include/linux/kprobes.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-11-07 15:18:49 +0300
committerIngo Molnar <mingo@kernel.org>2020-11-07 15:18:49 +0300
commit0a986ea81e1aa8ac17e82cda53cc95158217956e (patch)
treea054b0ef413b7f327c04137c5768b2da6488511d /include/linux/kprobes.h
parent6e426e0fcd20ce144bb93e00b70df51e9f2e08c3 (diff)
parent36dadef23fcca55bb6531dc12822d3b165319ccc (diff)
downloadlinux-0a986ea81e1aa8ac17e82cda53cc95158217956e.tar.xz
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>
Diffstat (limited to 'include/linux/kprobes.h')
-rw-r--r--include/linux/kprobes.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index b7824e3f1ef5..a79404433812 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -399,6 +399,8 @@ void unregister_kretprobes(struct kretprobe **rps, int num);
void kprobe_flush_task(struct task_struct *tk);
+void kprobe_free_init_mem(void);
+
int disable_kprobe(struct kprobe *kp);
int enable_kprobe(struct kprobe *kp);
@@ -461,6 +463,9 @@ static inline void unregister_kretprobes(struct kretprobe **rps, int num)
static inline void kprobe_flush_task(struct task_struct *tk)
{
}
+static inline void kprobe_free_init_mem(void)
+{
+}
static inline int disable_kprobe(struct kprobe *kp)
{
return -ENOSYS;