Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip

[linux-2.6-omap-h63xx.git] / arch / x86 / oprofile / op_model_ppro.c

diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index f5a226823e947485240aede0839098caee96add0..0620d6d45f7d08f99e8974396260fb071f02948c 100644 (file)
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -201,14 +201,14 @@ static void ppro_shutdown(struct op_msrs const * const msrs)
 
 
 struct op_x86_model_spec op_ppro_spec = {
-       .num_counters = 2,      /* can be overriden */
-       .num_controls = 2,      /* dito */
-       .fill_in_addresses = &ppro_fill_in_addresses,
-       .setup_ctrs = &ppro_setup_ctrs,
-       .check_ctrs = &ppro_check_ctrs,
-       .start = &ppro_start,
-       .stop = &ppro_stop,
-       .shutdown = &ppro_shutdown
+       .num_counters           = 2,    /* can be overriden */
+       .num_controls           = 2,    /* dito */
+       .fill_in_addresses      = &ppro_fill_in_addresses,
+       .setup_ctrs             = &ppro_setup_ctrs,
+       .check_ctrs             = &ppro_check_ctrs,
+       .start                  = &ppro_start,
+       .stop                   = &ppro_stop,
+       .shutdown               = &ppro_shutdown
 };
 
 /*
@@ -244,11 +244,11 @@ void arch_perfmon_setup_counters(void)
 
 struct op_x86_model_spec op_arch_perfmon_spec = {
        /* num_counters/num_controls filled in at runtime */
-       .fill_in_addresses = &ppro_fill_in_addresses,
+       .fill_in_addresses      = &ppro_fill_in_addresses,
        /* user space does the cpuid check for available events */
-       .setup_ctrs = &ppro_setup_ctrs,
-       .check_ctrs = &ppro_check_ctrs,
-       .start = &ppro_start,
-       .stop = &ppro_stop,
-       .shutdown = &ppro_shutdown
+       .setup_ctrs             = &ppro_setup_ctrs,
+       .check_ctrs             = &ppro_check_ctrs,
+       .start                  = &ppro_start,
+       .stop                   = &ppro_stop,
+       .shutdown               = &ppro_shutdown
 };