x86/oprofile: Remove unused num_virt_controls from struct op_x86_model_spec

The member num_virt_controls of struct op_x86_model_spec is not
used. This patch removes it.

Signed-off-by: Robert Richter <robert.richter@amd.com>

diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
index 39604b429d695802fd01d2cae897a3510ec407c4..dce69b5979e6554836dbd52d85d3f3f79d1ca140 100644 (file)
--- 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 = {
        .num_counters           = NUM_COUNTERS,
        .num_controls           = NUM_CONTROLS,
        .num_virt_counters      = NUM_VIRT_COUNTERS,
-       .num_virt_controls      = NUM_VIRT_CONTROLS,
        .reserved               = MSR_AMD_EVENTSEL_RESERVED,
        .event_mask             = OP_EVENT_MASK,
        .init                   = op_amd_init,

diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 40df028d0d91209cd2c1af8b1db20427d7ff996c..0a4f2deb9e8fb40904a7b77f9e1268c020af0b46 100644 (file)
--- 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 = {
        .num_counters           = NUM_COUNTERS_HT2,
        .num_controls           = NUM_CONTROLS_HT2,
        .num_virt_counters      = NUM_COUNTERS_HT2,
-       .num_virt_controls      = NUM_CONTROLS_HT2,
        .fill_in_addresses      = &p4_fill_in_addresses,
        .setup_ctrs             = &p4_setup_ctrs,
        .check_ctrs             = &p4_check_ctrs,
@@ -713,7 +712,6 @@ struct op_x86_model_spec op_p4_spec = {
        .num_counters           = NUM_COUNTERS_NON_HT,
        .num_controls           = NUM_CONTROLS_NON_HT,
        .num_virt_counters      = NUM_COUNTERS_NON_HT,
-       .num_virt_controls      = NUM_CONTROLS_NON_HT,
        .fill_in_addresses      = &p4_fill_in_addresses,
        .setup_ctrs             = &p4_setup_ctrs,
        .check_ctrs             = &p4_check_ctrs,

diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index 659f3b6f86fbd038eb2c0d6e794d9a43a0999738..753a02ab215b0b5b290931d9e0ffaa9acc8f0e24 100644 (file)
--- 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 = {
        .num_counters           = 2,
        .num_controls           = 2,
        .num_virt_counters      = 2,
-       .num_virt_controls      = 2,
        .reserved               = MSR_PPRO_EVENTSEL_RESERVED,
        .fill_in_addresses      = &ppro_fill_in_addresses,
        .setup_ctrs             = &ppro_setup_ctrs,

diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index 0c886fa0369cb20f7934bc75726f4650a1f4ab9e..4e2e7c2c519f58a6a89cf73d9b44d85892650e7b 100644 (file)
--- 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 {
        unsigned int    num_counters;
        unsigned int    num_controls;
        unsigned int    num_virt_counters;
-       unsigned int    num_virt_controls;
        u64             reserved;
        u16             event_mask;
        int             (*init)(struct oprofile_operations *ops);