Skip to content

Commit

Permalink
x86/oprofile: Whitespaces changes only
Browse files Browse the repository at this point in the history 
This patch fixes whitespace changes of code that will be touched in
follow-on patches.

Signed-off-by: Robert Richter <robert.richter@amd.com>
  • Loading branch information
Robert Richter committed Jul 14, 2009
1 parent 44ab9a6 commit 6e63ea4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions arch/x86/oprofile/nmi_int.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,12 +516,12 @@ int __init op_nmi_init(struct oprofile_operations *ops)
register_cpu_notifier(&oprofile_cpu_nb);
#endif
/* default values, can be overwritten by model */
ops->create_files = nmi_create_files;
ops->setup = nmi_setup;
ops->shutdown = nmi_shutdown;
ops->start = nmi_start;
ops->stop = nmi_stop;
ops->cpu_type = cpu_type;
ops->create_files = nmi_create_files;
ops->setup = nmi_setup;
ops->shutdown = nmi_shutdown;
ops->start = nmi_start;
ops->stop = nmi_stop;
ops->cpu_type = cpu_type;

if (model->init)
ret = model->init(ops);
Expand Down
12 changes: 6 additions & 6 deletions arch/x86/oprofile/op_model_amd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void op_amd_setup_ctrs(struct op_x86_model_spec const *model,
int i;

/* clear all counters */
for (i = 0 ; i < NUM_CONTROLS; ++i) {
for (i = 0; i < NUM_CONTROLS; ++i) {
if (unlikely(!msrs->controls[i].addr))
continue;
rdmsrl(msrs->controls[i].addr, val);
Expand Down Expand Up @@ -229,7 +229,7 @@ static int op_amd_check_ctrs(struct pt_regs * const regs,
u64 val;
int i;

for (i = 0 ; i < NUM_COUNTERS; ++i) {
for (i = 0; i < NUM_COUNTERS; ++i) {
if (!reset_value[i])
continue;
rdmsrl(msrs->counters[i].addr, val);
Expand All @@ -250,7 +250,7 @@ static void op_amd_start(struct op_msrs const * const msrs)
{
u64 val;
int i;
for (i = 0 ; i < NUM_COUNTERS ; ++i) {
for (i = 0; i < NUM_COUNTERS; ++i) {
if (reset_value[i]) {
rdmsrl(msrs->controls[i].addr, val);
val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
Expand All @@ -270,7 +270,7 @@ static void op_amd_stop(struct op_msrs const * const msrs)
* Subtle: stop on all counters to avoid race with setting our
* pm callback
*/
for (i = 0 ; i < NUM_COUNTERS ; ++i) {
for (i = 0; i < NUM_COUNTERS; ++i) {
if (!reset_value[i])
continue;
rdmsrl(msrs->controls[i].addr, val);
Expand All @@ -285,11 +285,11 @@ static void op_amd_shutdown(struct op_msrs const * const msrs)
{
int i;

for (i = 0 ; i < NUM_COUNTERS ; ++i) {
for (i = 0; i < NUM_COUNTERS; ++i) {
if (msrs->counters[i].addr)
release_perfctr_nmi(MSR_K7_PERFCTR0 + i);
}
for (i = 0 ; i < NUM_CONTROLS ; ++i) {
for (i = 0; i < NUM_CONTROLS; ++i) {
if (msrs->controls[i].addr)
release_evntsel_nmi(MSR_K7_EVNTSEL0 + i);
}
Expand Down
8 changes: 4 additions & 4 deletions arch/x86/oprofile/op_model_p4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ static void p4_setup_ctrs(struct op_x86_model_spec const *model,
}

/* clear the cccrs we will use */
for (i = 0 ; i < num_counters ; i++) {
for (i = 0; i < num_counters; i++) {
if (unlikely(!msrs->controls[i].addr))
continue;
rdmsr(p4_counters[VIRT_CTR(stag, i)].cccr_address, low, high);
Expand All @@ -575,7 +575,7 @@ static void p4_setup_ctrs(struct op_x86_model_spec const *model,
}

/* setup all counters */
for (i = 0 ; i < num_counters ; ++i) {
for (i = 0; i < num_counters; ++i) {
if (counter_config[i].enabled && msrs->controls[i].addr) {
reset_value[i] = counter_config[i].count;
pmc_setup_one_p4_counter(i);
Expand Down Expand Up @@ -678,7 +678,7 @@ static void p4_shutdown(struct op_msrs const * const msrs)
{
int i;

for (i = 0 ; i < num_counters ; ++i) {
for (i = 0; i < num_counters; ++i) {
if (msrs->counters[i].addr)
release_perfctr_nmi(msrs->counters[i].addr);
}
Expand All @@ -687,7 +687,7 @@ static void p4_shutdown(struct op_msrs const * const msrs)
* conjunction with the counter registers (hence the starting offset).
* This saves a few bits.
*/
for (i = num_counters ; i < num_controls ; ++i) {
for (i = num_counters; i < num_controls; ++i) {
if (msrs->controls[i].addr)
release_evntsel_nmi(msrs->controls[i].addr);
}
Expand Down
8 changes: 4 additions & 4 deletions arch/x86/oprofile/op_model_ppro.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static void ppro_setup_ctrs(struct op_x86_model_spec const *model,
}

/* clear all counters */
for (i = 0 ; i < num_counters; ++i) {
for (i = 0; i < num_counters; ++i) {
if (unlikely(!msrs->controls[i].addr))
continue;
rdmsrl(msrs->controls[i].addr, val);
Expand Down Expand Up @@ -125,7 +125,7 @@ static int ppro_check_ctrs(struct pt_regs * const regs,
if (unlikely(!reset_value))
goto out;

for (i = 0 ; i < num_counters; ++i) {
for (i = 0; i < num_counters; ++i) {
if (!reset_value[i])
continue;
rdmsrl(msrs->counters[i].addr, val);
Expand Down Expand Up @@ -188,11 +188,11 @@ static void ppro_shutdown(struct op_msrs const * const msrs)
{
int i;

for (i = 0 ; i < num_counters ; ++i) {
for (i = 0; i < num_counters; ++i) {
if (msrs->counters[i].addr)
release_perfctr_nmi(MSR_P6_PERFCTR0 + i);
}
for (i = 0 ; i < num_counters ; ++i) {
for (i = 0; i < num_counters; ++i) {
if (msrs->controls[i].addr)
release_evntsel_nmi(MSR_P6_EVNTSEL0 + i);
}
Expand Down

0 comments on commit 6e63ea4

Please sign in to comment.