diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 1 | ||||
-rw-r--r-- | arch/x86/oprofile/op_model_p4.c | 2 | ||||
-rw-r--r-- | arch/x86/oprofile/op_model_ppro.c | 1 | ||||
-rw-r--r-- | arch/x86/oprofile/op_x86_model.h | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 39604b429d69..dce69b5979e6 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c | |||
@@ -530,7 +530,6 @@ struct op_x86_model_spec op_amd_spec = { | |||
530 | .num_counters = NUM_COUNTERS, | 530 | .num_counters = NUM_COUNTERS, |
531 | .num_controls = NUM_CONTROLS, | 531 | .num_controls = NUM_CONTROLS, |
532 | .num_virt_counters = NUM_VIRT_COUNTERS, | 532 | .num_virt_counters = NUM_VIRT_COUNTERS, |
533 | .num_virt_controls = NUM_VIRT_CONTROLS, | ||
534 | .reserved = MSR_AMD_EVENTSEL_RESERVED, | 533 | .reserved = MSR_AMD_EVENTSEL_RESERVED, |
535 | .event_mask = OP_EVENT_MASK, | 534 | .event_mask = OP_EVENT_MASK, |
536 | .init = op_amd_init, | 535 | .init = op_amd_init, |
diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c index 40df028d0d91..0a4f2deb9e8f 100644 --- a/arch/x86/oprofile/op_model_p4.c +++ b/arch/x86/oprofile/op_model_p4.c | |||
@@ -699,7 +699,6 @@ struct op_x86_model_spec op_p4_ht2_spec = { | |||
699 | .num_counters = NUM_COUNTERS_HT2, | 699 | .num_counters = NUM_COUNTERS_HT2, |
700 | .num_controls = NUM_CONTROLS_HT2, | 700 | .num_controls = NUM_CONTROLS_HT2, |
701 | .num_virt_counters = NUM_COUNTERS_HT2, | 701 | .num_virt_counters = NUM_COUNTERS_HT2, |
702 | .num_virt_controls = NUM_CONTROLS_HT2, | ||
703 | .fill_in_addresses = &p4_fill_in_addresses, | 702 | .fill_in_addresses = &p4_fill_in_addresses, |
704 | .setup_ctrs = &p4_setup_ctrs, | 703 | .setup_ctrs = &p4_setup_ctrs, |
705 | .check_ctrs = &p4_check_ctrs, | 704 | .check_ctrs = &p4_check_ctrs, |
@@ -713,7 +712,6 @@ struct op_x86_model_spec op_p4_spec = { | |||
713 | .num_counters = NUM_COUNTERS_NON_HT, | 712 | .num_counters = NUM_COUNTERS_NON_HT, |
714 | .num_controls = NUM_CONTROLS_NON_HT, | 713 | .num_controls = NUM_CONTROLS_NON_HT, |
715 | .num_virt_counters = NUM_COUNTERS_NON_HT, | 714 | .num_virt_counters = NUM_COUNTERS_NON_HT, |
716 | .num_virt_controls = NUM_CONTROLS_NON_HT, | ||
717 | .fill_in_addresses = &p4_fill_in_addresses, | 715 | .fill_in_addresses = &p4_fill_in_addresses, |
718 | .setup_ctrs = &p4_setup_ctrs, | 716 | .setup_ctrs = &p4_setup_ctrs, |
719 | .check_ctrs = &p4_check_ctrs, | 717 | .check_ctrs = &p4_check_ctrs, |
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 659f3b6f86fb..753a02ab215b 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c | |||
@@ -207,7 +207,6 @@ struct op_x86_model_spec op_ppro_spec = { | |||
207 | .num_counters = 2, | 207 | .num_counters = 2, |
208 | .num_controls = 2, | 208 | .num_controls = 2, |
209 | .num_virt_counters = 2, | 209 | .num_virt_counters = 2, |
210 | .num_virt_controls = 2, | ||
211 | .reserved = MSR_PPRO_EVENTSEL_RESERVED, | 210 | .reserved = MSR_PPRO_EVENTSEL_RESERVED, |
212 | .fill_in_addresses = &ppro_fill_in_addresses, | 211 | .fill_in_addresses = &ppro_fill_in_addresses, |
213 | .setup_ctrs = &ppro_setup_ctrs, | 212 | .setup_ctrs = &ppro_setup_ctrs, |
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h index 0c886fa0369c..4e2e7c2c519f 100644 --- a/arch/x86/oprofile/op_x86_model.h +++ b/arch/x86/oprofile/op_x86_model.h | |||
@@ -37,7 +37,6 @@ struct op_x86_model_spec { | |||
37 | unsigned int num_counters; | 37 | unsigned int num_counters; |
38 | unsigned int num_controls; | 38 | unsigned int num_controls; |
39 | unsigned int num_virt_counters; | 39 | unsigned int num_virt_counters; |
40 | unsigned int num_virt_controls; | ||
41 | u64 reserved; | 40 | u64 reserved; |
42 | u16 event_mask; | 41 | u16 event_mask; |
43 | int (*init)(struct oprofile_operations *ops); | 42 | int (*init)(struct oprofile_operations *ops); |