diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
| commit | 02615365a92ca2570c1f96abc8a97674aa2ccae1 (patch) | |
| tree | ebedfd91a0f6d299b39e84295e091e12c0767dc8 /runtime/perf.h | |
| parent | c3bad3042df505a3470f1e20b09822a9df1d4761 (diff) | |
| parent | adc67597f327cd43d58b1d0cb740dab14a75a058 (diff) | |
| download | systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.gz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.xz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.zip | |
Merge branch 'master' into pr6866
Conflicts:
ChangeLog: Removed
runtime/ChangeLog: Removed
runtime/sym.c: Merged
runtime/task_finder.c: Merged
tapset/ChangeLog: Removed
testsuite/ChangeLog: Removed
Diffstat (limited to 'runtime/perf.h')
| -rw-r--r-- | runtime/perf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/perf.h b/runtime/perf.h index e3212228..6a87bff0 100644 --- a/runtime/perf.h +++ b/runtime/perf.h @@ -15,13 +15,13 @@ * @brief Header file for performance monitoring hardware support */ -int _stp_perfmon_setup(void **desc, +static int _stp_perfmon_setup(void **desc, struct pfarg_ctx *context, struct pfarg_pmc pmc[], int pmc_count, struct pfarg_pmd pmd[], int pmd_count); -int _stp_perfmon_shutdown(void *desc); +static int _stp_perfmon_shutdown(void *desc); -int64_t _stp_perfmon_read(void *desc, int counter); +static int64_t _stp_perfmon_read(void *desc, int counter); #endif /* _PERF_H_ */ |