diff options
author | Robert Richter <robert.richter@amd.com> | 2008-09-05 11:12:36 -0400 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2008-10-15 14:47:41 -0400 |
commit | c92960fccb9f32a1d6110f6dcfe483ed96c62beb (patch) | |
tree | 8c4b7937956dd01174cfd13e046a6c4f6bc05b96 | |
parent | ccd755c2d90dd9b9729ba5975f7c92bf206ddcf7 (diff) |
oprofile: whitespace fixes
Signed-off-by: Robert Richter <robert.richter@amd.com>
-rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 20 | ||||
-rw-r--r-- | arch/x86/oprofile/op_model_p4.c | 32 | ||||
-rw-r--r-- | arch/x86/oprofile/op_model_ppro.c | 16 | ||||
-rw-r--r-- | drivers/oprofile/buffer_sync.c | 1 | ||||
-rw-r--r-- | drivers/oprofile/oprof.c | 24 |
5 files changed, 46 insertions, 47 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 23ce63f2762c..b9a810b33261 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c | |||
@@ -530,14 +530,14 @@ static void op_amd_exit(void) | |||
530 | #endif | 530 | #endif |
531 | 531 | ||
532 | struct op_x86_model_spec const op_amd_spec = { | 532 | struct op_x86_model_spec const op_amd_spec = { |
533 | .init = op_amd_init, | 533 | .init = op_amd_init, |
534 | .exit = op_amd_exit, | 534 | .exit = op_amd_exit, |
535 | .num_counters = NUM_COUNTERS, | 535 | .num_counters = NUM_COUNTERS, |
536 | .num_controls = NUM_CONTROLS, | 536 | .num_controls = NUM_CONTROLS, |
537 | .fill_in_addresses = &op_amd_fill_in_addresses, | 537 | .fill_in_addresses = &op_amd_fill_in_addresses, |
538 | .setup_ctrs = &op_amd_setup_ctrs, | 538 | .setup_ctrs = &op_amd_setup_ctrs, |
539 | .check_ctrs = &op_amd_check_ctrs, | 539 | .check_ctrs = &op_amd_check_ctrs, |
540 | .start = &op_amd_start, | 540 | .start = &op_amd_start, |
541 | .stop = &op_amd_stop, | 541 | .stop = &op_amd_stop, |
542 | .shutdown = &op_amd_shutdown | 542 | .shutdown = &op_amd_shutdown |
543 | }; | 543 | }; |
diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c index 43ac5af338d8..4c4a51c90bc2 100644 --- 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) | |||
698 | 698 | ||
699 | #ifdef CONFIG_SMP | 699 | #ifdef CONFIG_SMP |
700 | struct op_x86_model_spec const op_p4_ht2_spec = { | 700 | struct op_x86_model_spec const op_p4_ht2_spec = { |
701 | .num_counters = NUM_COUNTERS_HT2, | 701 | .num_counters = NUM_COUNTERS_HT2, |
702 | .num_controls = NUM_CONTROLS_HT2, | 702 | .num_controls = NUM_CONTROLS_HT2, |
703 | .fill_in_addresses = &p4_fill_in_addresses, | 703 | .fill_in_addresses = &p4_fill_in_addresses, |
704 | .setup_ctrs = &p4_setup_ctrs, | 704 | .setup_ctrs = &p4_setup_ctrs, |
705 | .check_ctrs = &p4_check_ctrs, | 705 | .check_ctrs = &p4_check_ctrs, |
706 | .start = &p4_start, | 706 | .start = &p4_start, |
707 | .stop = &p4_stop, | 707 | .stop = &p4_stop, |
708 | .shutdown = &p4_shutdown | 708 | .shutdown = &p4_shutdown |
709 | }; | 709 | }; |
710 | #endif | 710 | #endif |
711 | 711 | ||
712 | struct op_x86_model_spec const op_p4_spec = { | 712 | struct op_x86_model_spec const op_p4_spec = { |
713 | .num_counters = NUM_COUNTERS_NON_HT, | 713 | .num_counters = NUM_COUNTERS_NON_HT, |
714 | .num_controls = NUM_CONTROLS_NON_HT, | 714 | .num_controls = NUM_CONTROLS_NON_HT, |
715 | .fill_in_addresses = &p4_fill_in_addresses, | 715 | .fill_in_addresses = &p4_fill_in_addresses, |
716 | .setup_ctrs = &p4_setup_ctrs, | 716 | .setup_ctrs = &p4_setup_ctrs, |
717 | .check_ctrs = &p4_check_ctrs, | 717 | .check_ctrs = &p4_check_ctrs, |
718 | .start = &p4_start, | 718 | .start = &p4_start, |
719 | .stop = &p4_stop, | 719 | .stop = &p4_stop, |
720 | .shutdown = &p4_shutdown | 720 | .shutdown = &p4_shutdown |
721 | }; | 721 | }; |
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index eff431f6c57b..c665bac4a143 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c | |||
@@ -181,12 +181,12 @@ static void ppro_shutdown(struct op_msrs const * const msrs) | |||
181 | 181 | ||
182 | 182 | ||
183 | struct op_x86_model_spec const op_ppro_spec = { | 183 | struct op_x86_model_spec const op_ppro_spec = { |
184 | .num_counters = NUM_COUNTERS, | 184 | .num_counters = NUM_COUNTERS, |
185 | .num_controls = NUM_CONTROLS, | 185 | .num_controls = NUM_CONTROLS, |
186 | .fill_in_addresses = &ppro_fill_in_addresses, | 186 | .fill_in_addresses = &ppro_fill_in_addresses, |
187 | .setup_ctrs = &ppro_setup_ctrs, | 187 | .setup_ctrs = &ppro_setup_ctrs, |
188 | .check_ctrs = &ppro_check_ctrs, | 188 | .check_ctrs = &ppro_check_ctrs, |
189 | .start = &ppro_start, | 189 | .start = &ppro_start, |
190 | .stop = &ppro_stop, | 190 | .stop = &ppro_stop, |
191 | .shutdown = &ppro_shutdown | 191 | .shutdown = &ppro_shutdown |
192 | }; | 192 | }; |
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c index ed982273fb8b..564577307a5e 100644 --- a/drivers/oprofile/buffer_sync.c +++ b/drivers/oprofile/buffer_sync.c | |||
@@ -41,7 +41,6 @@ static cpumask_t marked_cpus = CPU_MASK_NONE; | |||
41 | static DEFINE_SPINLOCK(task_mortuary); | 41 | static DEFINE_SPINLOCK(task_mortuary); |
42 | static void process_task_mortuary(void); | 42 | static void process_task_mortuary(void); |
43 | 43 | ||
44 | |||
45 | /* Take ownership of the task struct and place it on the | 44 | /* Take ownership of the task struct and place it on the |
46 | * list for processing. Only after two full buffer syncs | 45 | * list for processing. Only after two full buffer syncs |
47 | * does the task eventually get freed, because by then | 46 | * does the task eventually get freed, because by then |
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c index 2c645170f06e..50062cea292c 100644 --- a/drivers/oprofile/oprof.c +++ b/drivers/oprofile/oprof.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include "cpu_buffer.h" | 19 | #include "cpu_buffer.h" |
20 | #include "buffer_sync.h" | 20 | #include "buffer_sync.h" |
21 | #include "oprofile_stats.h" | 21 | #include "oprofile_stats.h" |
22 | 22 | ||
23 | struct oprofile_operations oprofile_ops; | 23 | struct oprofile_operations oprofile_ops; |
24 | 24 | ||
25 | unsigned long oprofile_started; | 25 | unsigned long oprofile_started; |
@@ -36,7 +36,7 @@ static int timer = 0; | |||
36 | int oprofile_setup(void) | 36 | int oprofile_setup(void) |
37 | { | 37 | { |
38 | int err; | 38 | int err; |
39 | 39 | ||
40 | mutex_lock(&start_mutex); | 40 | mutex_lock(&start_mutex); |
41 | 41 | ||
42 | if ((err = alloc_cpu_buffers())) | 42 | if ((err = alloc_cpu_buffers())) |
@@ -44,10 +44,10 @@ int oprofile_setup(void) | |||
44 | 44 | ||
45 | if ((err = alloc_event_buffer())) | 45 | if ((err = alloc_event_buffer())) |
46 | goto out1; | 46 | goto out1; |
47 | 47 | ||
48 | if (oprofile_ops.setup && (err = oprofile_ops.setup())) | 48 | if (oprofile_ops.setup && (err = oprofile_ops.setup())) |
49 | goto out2; | 49 | goto out2; |
50 | 50 | ||
51 | /* Note even though this starts part of the | 51 | /* Note even though this starts part of the |
52 | * profiling overhead, it's necessary to prevent | 52 | * profiling overhead, it's necessary to prevent |
53 | * us missing task deaths and eventually oopsing | 53 | * us missing task deaths and eventually oopsing |
@@ -74,7 +74,7 @@ post_sync: | |||
74 | is_setup = 1; | 74 | is_setup = 1; |
75 | mutex_unlock(&start_mutex); | 75 | mutex_unlock(&start_mutex); |
76 | return 0; | 76 | return 0; |
77 | 77 | ||
78 | out3: | 78 | out3: |
79 | if (oprofile_ops.shutdown) | 79 | if (oprofile_ops.shutdown) |
80 | oprofile_ops.shutdown(); | 80 | oprofile_ops.shutdown(); |
@@ -92,17 +92,17 @@ out: | |||
92 | int oprofile_start(void) | 92 | int oprofile_start(void) |
93 | { | 93 | { |
94 | int err = -EINVAL; | 94 | int err = -EINVAL; |
95 | 95 | ||
96 | mutex_lock(&start_mutex); | 96 | mutex_lock(&start_mutex); |
97 | 97 | ||
98 | if (!is_setup) | 98 | if (!is_setup) |
99 | goto out; | 99 | goto out; |
100 | 100 | ||
101 | err = 0; | 101 | err = 0; |
102 | 102 | ||
103 | if (oprofile_started) | 103 | if (oprofile_started) |
104 | goto out; | 104 | goto out; |
105 | 105 | ||
106 | oprofile_reset_stats(); | 106 | oprofile_reset_stats(); |
107 | 107 | ||
108 | if ((err = oprofile_ops.start())) | 108 | if ((err = oprofile_ops.start())) |
@@ -114,7 +114,7 @@ out: | |||
114 | return err; | 114 | return err; |
115 | } | 115 | } |
116 | 116 | ||
117 | 117 | ||
118 | /* echo 0>/dev/oprofile/enable */ | 118 | /* echo 0>/dev/oprofile/enable */ |
119 | void oprofile_stop(void) | 119 | void oprofile_stop(void) |
120 | { | 120 | { |
@@ -204,13 +204,13 @@ static void __exit oprofile_exit(void) | |||
204 | oprofile_arch_exit(); | 204 | oprofile_arch_exit(); |
205 | } | 205 | } |
206 | 206 | ||
207 | 207 | ||
208 | module_init(oprofile_init); | 208 | module_init(oprofile_init); |
209 | module_exit(oprofile_exit); | 209 | module_exit(oprofile_exit); |
210 | 210 | ||
211 | module_param_named(timer, timer, int, 0644); | 211 | module_param_named(timer, timer, int, 0644); |
212 | MODULE_PARM_DESC(timer, "force use of timer interrupt"); | 212 | MODULE_PARM_DESC(timer, "force use of timer interrupt"); |
213 | 213 | ||
214 | MODULE_LICENSE("GPL"); | 214 | MODULE_LICENSE("GPL"); |
215 | MODULE_AUTHOR("John Levon <levon@movementarian.org>"); | 215 | MODULE_AUTHOR("John Levon <levon@movementarian.org>"); |
216 | MODULE_DESCRIPTION("OProfile system profiler"); | 216 | MODULE_DESCRIPTION("OProfile system profiler"); |