summaryrefslogtreecommitdiffstats
path: root/arch/x86/oprofile/op_x86_model.h
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-09-24 11:08:52 +0200
committerRobert Richter <robert.richter@amd.com>2008-09-24 11:08:52 +0200
commit4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (patch)
tree315bb66a3ce2e752749a780876e2b7b5f6a596de /arch/x86/oprofile/op_x86_model.h
parent45f197ade73ba95681b9803680c75352fc0a1c0a (diff)
downloadblackbird-op-linux-4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d.tar.gz
blackbird-op-linux-4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d.zip
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 'arch/x86/oprofile/op_x86_model.h')
-rw-r--r--arch/x86/oprofile/op_x86_model.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index e07ba1076371..05a0261ba0c3 100644
--- a/arch/x86/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
@@ -19,7 +19,6 @@ struct op_saved_msr {
struct op_msr {
unsigned long addr;
struct op_saved_msr saved;
- struct op_saved_msr multiplex;
};
struct op_msrs {
@@ -35,8 +34,6 @@ struct pt_regs;
struct op_x86_model_spec {
int (*init)(struct oprofile_operations *ops);
void (*exit)(void);
- unsigned int const num_hardware_counters;
- unsigned int const num_hardware_controls;
unsigned int const num_counters;
unsigned int const num_controls;
void (*fill_in_addresses)(struct op_msrs * const msrs);
OpenPOWER on IntegriCloud