Merge branch 'linus' into perf/core, to refresh the branch

[mirror_ubuntu-bionic-kernel.git] / include / linux / perf_event.h

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index a7593d653b406b0e5ddd5d7fe0a9598d6db90d64..7921f4f20a5890a96d2099c05a105d51a3ec2c3d 100644 (file)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -990,8 +990,6 @@ static inline void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned lo
  */
 static inline void perf_fetch_caller_regs(struct pt_regs *regs)
 {
-       memset(regs, 0, sizeof(*regs));
-
        perf_arch_fetch_caller_regs(regs, CALLER_ADDR0);
 }
 
@@ -1146,7 +1144,7 @@ static inline bool perf_paranoid_kernel(void)
 }
 
 extern void perf_event_init(void);
-extern void perf_tp_event(u64 addr, u64 count, void *record,
+extern void perf_tp_event(u16 event_type, u64 count, void *record,
                          int entry_size, struct pt_regs *regs,
                          struct hlist_head *head, int rctx,
                          struct task_struct *task);