diff options
author | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:08:52 -0400 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:08:52 -0400 |
commit | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (patch) | |
tree | 315bb66a3ce2e752749a780876e2b7b5f6a596de /include/linux | |
parent | 45f197ade73ba95681b9803680c75352fc0a1c0a (diff) |
Revert "Oprofile Multiplexing Patch"
Reverting commit 1a960b402a51d80abf54e3f8e4972374ffe5f22d for the main
branch. Multiplexing will be tracked on a separate feature branch.
Conflicts:
arch/x86/oprofile/nmi_int.c
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 { | |||
67 | 67 | ||
68 | /* Initiate a stack backtrace. Optional. */ | 68 | /* Initiate a stack backtrace. Optional. */ |
69 | void (*backtrace)(struct pt_regs * const regs, unsigned int depth); | 69 | void (*backtrace)(struct pt_regs * const regs, unsigned int depth); |
70 | |||
71 | /* Multiplex between different events. Optional. */ | ||
72 | int (*switch_events)(void); | ||
73 | /* CPU identification string. */ | 70 | /* CPU identification string. */ |
74 | char * cpu_type; | 71 | char * cpu_type; |
75 | }; | 72 | }; |