diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 21:43:07 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 21:43:07 +0400 |
| commit | da758ddede96dd850945d3417ff75209a666ba0d (patch) | |
| tree | f8da615ef68c9311b87af8fed6a7b717d7e5564d /include | |
| parent | 389623fef0e8b088f293c437d3b7094fe82349fd (diff) | |
| parent | 1054598cab8674438675085fae459e960eb10799 (diff) | |
| download | linux-da758ddede96dd850945d3417ff75209a666ba0d.tar.xz | |
Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf_counter: Fix double list iteration in per task precise stats
perf: Auto-detect libelf
perf symbol: Fix symbol parsing in certain cases: use the build-id as a symlink
perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it
ftrace: Fix perf-tracepoint OOPS
perf report: Add missing command line options to man page
perf: Auto-detect libbfd
perf report: Make --sort comm,dso,symbol the default
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ftrace_event.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 5c093ffc655b..d7cd193c2277 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -119,11 +119,9 @@ struct ftrace_event_call { void *filter; void *mod; -#ifdef CONFIG_EVENT_PROFILE - atomic_t profile_count; - int (*profile_enable)(struct ftrace_event_call *); - void (*profile_disable)(struct ftrace_event_call *); -#endif + atomic_t profile_count; + int (*profile_enable)(struct ftrace_event_call *); + void (*profile_disable)(struct ftrace_event_call *); }; #define MAX_FILTER_PRED 32 |