Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

Browse source 
* 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  tools/power turbostat: fit output into 80 columns on snb-ep
  tools/power x86_energy_perf_policy: fix print of uninitialized string
This commit is contained in:
Linus Torvalds 2011-08-02 21:17:39 -10:00
commit f673b7c2c5
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
tools/power/x86/turbostat/turbostat.c
View file

@ -128,34 +128,34 @@ unsigned long long get_msr(int cpu, off_t offset)
void print_header(void)
{
if (show_pkg)
fprintf(stderr, "pkg ");
fprintf(stderr, "pk");
if (show_core)
fprintf(stderr, "core");
fprintf(stderr, " cr");
if (show_cpu)
fprintf(stderr, " CPU");
if (do_nhm_cstates)
fprintf(stderr, " %%c0 ");
fprintf(stderr, " %%c0 ");
if (has_aperf)
fprintf(stderr, " GHz");
fprintf(stderr, " GHz");
fprintf(stderr, " TSC");
if (do_nhm_cstates)
fprintf(stderr, " %%c1 ");
fprintf(stderr, " %%c1");
if (do_nhm_cstates)
fprintf(stderr, " %%c3 ");
fprintf(stderr, " %%c3");
if (do_nhm_cstates)
fprintf(stderr, " %%c6 ");
fprintf(stderr, " %%c6");
if (do_snb_cstates)
fprintf(stderr, " %%c7 ");
fprintf(stderr, " %%c7");
if (do_snb_cstates)
fprintf(stderr, " %%pc2 ");
fprintf(stderr, " %%pc2");
if (do_nhm_cstates)
fprintf(stderr, " %%pc3 ");
fprintf(stderr, " %%pc3");
if (do_nhm_cstates)
fprintf(stderr, " %%pc6 ");
fprintf(stderr, " %%pc6");
if (do_snb_cstates)
fprintf(stderr, " %%pc7 ");
fprintf(stderr, " %%pc7");
if (extra_msr_offset)
fprintf(stderr, " MSR 0x%x ", extra_msr_offset);
fprintf(stderr, " MSR 0x%x ", extra_msr_offset);
putc('\n', stderr);
}
@ -194,14 +194,14 @@ void print_cnt(struct counters *p)
/* topology columns, print blanks on 1st (average) line */
if (p == cnt_average) {
if (show_pkg)
fprintf(stderr, " ");
fprintf(stderr, " ");
if (show_core)
fprintf(stderr, " ");
if (show_cpu)
fprintf(stderr, " ");
} else {
if (show_pkg)
fprintf(stderr, "%4d", p->pkg);
fprintf(stderr, "%d", p->pkg);
if (show_core)
fprintf(stderr, "%4d", p->core);
if (show_cpu)
@ -241,22 +241,22 @@ void print_cnt(struct counters *p)
if (!skip_c1)
fprintf(stderr, "%7.2f", 100.0 * p->c1/p->tsc);
else
fprintf(stderr, " ****");
fprintf(stderr, " ****");
}
if (do_nhm_cstates)
fprintf(stderr, "%7.2f", 100.0 * p->c3/p->tsc);
fprintf(stderr, " %6.2f", 100.0 * p->c3/p->tsc);
if (do_nhm_cstates)
fprintf(stderr, "%7.2f", 100.0 * p->c6/p->tsc);
fprintf(stderr, " %6.2f", 100.0 * p->c6/p->tsc);
if (do_snb_cstates)
fprintf(stderr, "%7.2f", 100.0 * p->c7/p->tsc);
fprintf(stderr, " %6.2f", 100.0 * p->c7/p->tsc);
if (do_snb_cstates)
fprintf(stderr, "%7.2f", 100.0 * p->pc2/p->tsc);
fprintf(stderr, " %5.2f", 100.0 * p->pc2/p->tsc);
if (do_nhm_cstates)
fprintf(stderr, "%7.2f", 100.0 * p->pc3/p->tsc);
fprintf(stderr, " %5.2f", 100.0 * p->pc3/p->tsc);
if (do_nhm_cstates)
fprintf(stderr, "%7.2f", 100.0 * p->pc6/p->tsc);
fprintf(stderr, " %5.2f", 100.0 * p->pc6/p->tsc);
if (do_snb_cstates)
fprintf(stderr, "%7.2f", 100.0 * p->pc7/p->tsc);
fprintf(stderr, " %5.2f", 100.0 * p->pc7/p->tsc);
if (extra_msr_offset)
fprintf(stderr, " 0x%016llx", p->extra_msr);
putc('\n', stderr);

5
tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
View file

@ -137,7 +137,6 @@ void cmdline(int argc, char **argv)
void validate_cpuid(void)
{
unsigned int eax, ebx, ecx, edx, max_level;
char brand[16];
unsigned int fms, family, model, stepping;
eax = ebx = ecx = edx = 0;
@ -160,8 +159,8 @@ void validate_cpuid(void)
model += ((fms >> 16) & 0xf) << 4;
if (verbose > 1)
printf("CPUID %s %d levels family:model:stepping "
"0x%x:%x:%x (%d:%d:%d)\n", brand, max_level,
printf("CPUID %d levels family:model:stepping "
"0x%x:%x:%x (%d:%d:%d)\n", max_level,
family, model, stepping, family, model, stepping);
if (!(edx & (1 << 5))) {