diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-30 14:19:41 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-30 14:28:50 +0400 |
| commit | 0d15504f16f68725e4635aa85411015d1c573b0a (patch) | |
| tree | 748d75062849f1c3ada597715ea4125063c57c48 /include/linux | |
| parent | 59293c8ad54726150cf6178164311b004d615ce4 (diff) | |
| parent | f78e80209cf143be49f268c340431ae9fa3abb74 (diff) | |
| download | linux-0d15504f16f68725e4635aa85411015d1c573b0a.tar.xz | |
Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/oprofile.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h index 687f2f4c36a1..bcb8f725427c 100644 --- a/include/linux/oprofile.h +++ b/include/linux/oprofile.h @@ -67,9 +67,6 @@ struct oprofile_operations { /* Initiate a stack backtrace. Optional. */ void (*backtrace)(struct pt_regs * const regs, unsigned int depth); - - /* Multiplex between different events. Optional. */ - int (*switch_events)(void); /* CPU identification string. */ char * cpu_type; }; |