Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

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

diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 43ac5af338d8c910c2295a7484453ab6b8a01b2a..4c4a51c90bc26f31cfc192adf2fb341ba7fcc754 100644 (file)
--- a/arch/x86/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
@@ -698,24 +698,24 @@ static void p4_shutdown(struct op_msrs const * const msrs)
 
 #ifdef CONFIG_SMP
 struct op_x86_model_spec const op_p4_ht2_spec = {
-       .num_counters = NUM_COUNTERS_HT2,
-       .num_controls = NUM_CONTROLS_HT2,
-       .fill_in_addresses = &p4_fill_in_addresses,
-       .setup_ctrs = &p4_setup_ctrs,
-       .check_ctrs = &p4_check_ctrs,
-       .start = &p4_start,
-       .stop = &p4_stop,
-       .shutdown = &p4_shutdown
+       .num_counters           = NUM_COUNTERS_HT2,
+       .num_controls           = NUM_CONTROLS_HT2,
+       .fill_in_addresses      = &p4_fill_in_addresses,
+       .setup_ctrs             = &p4_setup_ctrs,
+       .check_ctrs             = &p4_check_ctrs,
+       .start                  = &p4_start,
+       .stop                   = &p4_stop,
+       .shutdown               = &p4_shutdown
 };
 #endif
 
 struct op_x86_model_spec const op_p4_spec = {
-       .num_counters = NUM_COUNTERS_NON_HT,
-       .num_controls = NUM_CONTROLS_NON_HT,
-       .fill_in_addresses = &p4_fill_in_addresses,
-       .setup_ctrs = &p4_setup_ctrs,
-       .check_ctrs = &p4_check_ctrs,
-       .start = &p4_start,
-       .stop = &p4_stop,
-       .shutdown = &p4_shutdown
+       .num_counters           = NUM_COUNTERS_NON_HT,
+       .num_controls           = NUM_CONTROLS_NON_HT,
+       .fill_in_addresses      = &p4_fill_in_addresses,
+       .setup_ctrs             = &p4_setup_ctrs,
+       .check_ctrs             = &p4_check_ctrs,
+       .start                  = &p4_start,
+       .stop                   = &p4_stop,
+       .shutdown               = &p4_shutdown
 };