Merge tag 'linux-cpupower-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux (5ed909b3) · Commits · 戴 / test

tools/power/cpupower/utils/cpupower-info.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ int cmd_info(int argc, char **argv)
		default:
		print_wrong_arg_exit();
		}
		};
		}

		if (!params.params)
		params.params = 0x7;

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ static int amd_fam14h_get_pci_info(struct cstate *state,
		break;
		default:
		return -1;
		};
		}
		return 0;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static int cpuidle_start(void)
		dprint("CPU %d - State: %d - Val: %llu\n",
		cpu, state, previous_count[cpu][state]);
		}
		};
		}
		return 0;
		}

		@@ -72,7 +72,7 @@ static int cpuidle_stop(void)
		dprint("CPU %d - State: %d - Val: %llu\n",
		cpu, state, previous_count[cpu][state]);
		}
		};
		}
		return 0;
		}

		@@ -172,7 +172,7 @@ static struct cpuidle_monitor *cpuidle_register(void)
		cpuidle_cstates[num].id = num;
		cpuidle_cstates[num].get_count_percent =
		cpuidle_get_count_percent;
		};
		}

		/* Free this at program termination */
		previous_count = malloc(sizeof(long long ) cpu_count);

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ static int hsw_ext_get_count(enum intel_hsw_ext_id id, unsigned long long *val,
		break;
		default:
		return -1;
		};
		}
		if (read_msr(cpu, msr, val))
		return -1;
		return 0;