Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f673b7c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents c299eba3 d30c4b7a

tools/power/x86/turbostat/turbostat.c

+23 −23
Original line number Diff line number Diff line
@@ -128,9 +128,9 @@ 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)
@@ -201,7 +201,7 @@ void print_cnt(struct counters *p) 
			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)
@@ -244,19 +244,19 @@ void print_cnt(struct counters *p) 
			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);

tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c

+2 −3
Original line number Diff line number Diff line
@@ -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))) {