aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_kprobe.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace_kprobe.c')
-rw-r--r--kernel/trace/trace_kprobe.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 375f81a568dc..75d75dec226a 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1249,7 +1249,7 @@ static int kretprobe_event_show_format(struct ftrace_event_call *call,
1249 ", REC->" FIELD_STRING_RETIP); 1249 ", REC->" FIELD_STRING_RETIP);
1250} 1250}
1251 1251
1252#ifdef CONFIG_EVENT_PROFILE 1252#ifdef CONFIG_PERF_EVENTS
1253 1253
1254/* Kprobe profile handler */ 1254/* Kprobe profile handler */
1255static __kprobes int kprobe_profile_func(struct kprobe *kp, 1255static __kprobes int kprobe_profile_func(struct kprobe *kp,
@@ -1407,7 +1407,7 @@ static void probe_profile_disable(struct ftrace_event_call *call)
1407 disable_kprobe(&tp->rp.kp); 1407 disable_kprobe(&tp->rp.kp);
1408 } 1408 }
1409} 1409}
1410#endif /* CONFIG_EVENT_PROFILE */ 1410#endif /* CONFIG_PERF_EVENTS */
1411 1411
1412 1412
1413static __kprobes 1413static __kprobes
@@ -1417,10 +1417,10 @@ int kprobe_dispatcher(struct kprobe *kp, struct pt_regs *regs)
1417 1417
1418 if (tp->flags & TP_FLAG_TRACE) 1418 if (tp->flags & TP_FLAG_TRACE)
1419 kprobe_trace_func(kp, regs); 1419 kprobe_trace_func(kp, regs);
1420#ifdef CONFIG_EVENT_PROFILE 1420#ifdef CONFIG_PERF_EVENTS
1421 if (tp->flags & TP_FLAG_PROFILE) 1421 if (tp->flags & TP_FLAG_PROFILE)
1422 kprobe_profile_func(kp, regs); 1422 kprobe_profile_func(kp, regs);
1423#endif /* CONFIG_EVENT_PROFILE */ 1423#endif
1424 return 0; /* We don't tweek kernel, so just return 0 */ 1424 return 0; /* We don't tweek kernel, so just return 0 */
1425} 1425}
1426 1426
@@ -1431,10 +1431,10 @@ int kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs)
1431 1431
1432 if (tp->flags & TP_FLAG_TRACE) 1432 if (tp->flags & TP_FLAG_TRACE)
1433 kretprobe_trace_func(ri, regs); 1433 kretprobe_trace_func(ri, regs);
1434#ifdef CONFIG_EVENT_PROFILE 1434#ifdef CONFIG_PERF_EVENTS
1435 if (tp->flags & TP_FLAG_PROFILE) 1435 if (tp->flags & TP_FLAG_PROFILE)
1436 kretprobe_profile_func(ri, regs); 1436 kretprobe_profile_func(ri, regs);
1437#endif /* CONFIG_EVENT_PROFILE */ 1437#endif
1438 return 0; /* We don't tweek kernel, so just return 0 */ 1438 return 0; /* We don't tweek kernel, so just return 0 */
1439} 1439}
1440 1440
@@ -1463,7 +1463,7 @@ static int register_probe_event(struct trace_probe *tp)
1463 call->regfunc = probe_event_enable; 1463 call->regfunc = probe_event_enable;
1464 call->unregfunc = probe_event_disable; 1464 call->unregfunc = probe_event_disable;
1465 1465
1466#ifdef CONFIG_EVENT_PROFILE 1466#ifdef CONFIG_PERF_EVENTS
1467 call->profile_enable = probe_profile_enable; 1467 call->profile_enable = probe_profile_enable;
1468 call->profile_disable = probe_profile_disable; 1468 call->profile_disable = probe_profile_disable;
1469#endif 1469#endif