Revert "Oprofile Multiplexing Patch"

[safe/jmp/linux-2.6] / arch / x86 / oprofile / op_x86_model.h

diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index e07ba10..05a0261 100644 (file)
--- 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);